diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2014-03-07 09:25:18 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2014-03-07 09:25:18 +0100 |
| commit | e358922a74b01e6272c77caf01bc78a8295cc7d7 (patch) | |
| tree | 2148056adbec4af52d03f00eea3e9b0bd478f33c /drivers/base | |
| parent | 98615784a654f42e3914e5b401ddf24e50bdf64a (diff) | |
| parent | d5e38fc91345a60566ab92ebbea238c50be7c74b (diff) | |
| download | barebox-e358922a74b01e6272c77caf01bc78a8295cc7d7.tar.gz barebox-e358922a74b01e6272c77caf01bc78a8295cc7d7.tar.xz | |
Merge branch 'for-next/mtd'
Conflicts:
drivers/mtd/core.c
net/eth.c
Diffstat (limited to 'drivers/base')
| -rw-r--r-- | drivers/base/driver.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/base/driver.c b/drivers/base/driver.c index 4250fb0912..37560fd46f 100644 --- a/drivers/base/driver.c +++ b/drivers/base/driver.c @@ -154,6 +154,7 @@ int register_device(struct device_d *new_device) INIT_LIST_HEAD(&new_device->cdevs); INIT_LIST_HEAD(&new_device->parameters); INIT_LIST_HEAD(&new_device->active); + INIT_LIST_HEAD(&new_device->bus_list); if (new_device->bus) { if (!new_device->parent) @@ -181,6 +182,8 @@ int unregister_device(struct device_d *old_dev) dev_dbg(old_dev, "unregister\n"); + dev_remove_parameters(old_dev); + if (old_dev->driver) old_dev->bus->remove(old_dev); |