diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2012-12-07 16:43:21 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2012-12-07 16:43:21 +0100 |
| commit | 8f32824c6e374092f3c1dec431e5e83f839353fe (patch) | |
| tree | 9ceed735e77d1329ebf70c9f9abb78263358d2dd /drivers/base | |
| parent | 759946809a350b0a8158842924ab139e93eeef13 (diff) | |
| parent | bba73109ce1f54c7ffca044b00aacb320be888c2 (diff) | |
| download | barebox-8f32824c6e374092f3c1dec431e5e83f839353fe.tar.gz barebox-8f32824c6e374092f3c1dec431e5e83f839353fe.tar.xz | |
Merge branch 'for-next/phylib'
Conflicts:
drivers/net/phy/phy.c
Diffstat (limited to 'drivers/base')
| -rw-r--r-- | drivers/base/driver.c | 23 |
1 files changed, 17 insertions, 6 deletions
diff --git a/drivers/base/driver.c b/drivers/base/driver.c index c2e681934f..5b3542b7d3 100644 --- a/drivers/base/driver.c +++ b/drivers/base/driver.c @@ -75,6 +75,21 @@ int get_free_deviceid(const char *name_template) }; } +int device_probe(struct device_d *dev) +{ + int ret; + + ret = dev->bus->probe(dev); + if (ret) { + dev_err(dev, "probe failed: %s\n", strerror(-ret)); + return ret; + } + + list_add(&dev->active, &active); + + return 0; +} + static int match(struct driver_d *drv, struct device_d *dev) { int ret; @@ -86,13 +101,9 @@ static int match(struct driver_d *drv, struct device_d *dev) if (dev->bus->match(dev, drv)) goto err_out; - ret = dev->bus->probe(dev); - if (ret) { - dev_err(dev, "probe failed: %s\n", strerror(-ret)); + ret = device_probe(dev); + if (ret) goto err_out; - } - - list_add(&dev->active, &active); return 0; err_out: |