diff options
| author | Tom Rini <trini@konsulko.com> | 2015-08-06 19:56:03 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2015-08-06 19:56:03 -0400 |
| commit | ae27120c31d58b8bb694d9155bcffdcfae8552a6 (patch) | |
| tree | 8fcd4823406dc3adfb82174314198e9396c24feb /drivers/core/device-remove.c | |
| parent | f05fa6781ae1122f348e66b5b26acbfe552f6602 (diff) | |
| parent | fac971b2b5efbdb6ed2d12ebdbf7e029c5ed30e8 (diff) | |
Merge git://git.denx.de/u-boot-dm
Diffstat (limited to 'drivers/core/device-remove.c')
| -rw-r--r-- | drivers/core/device-remove.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/drivers/core/device-remove.c b/drivers/core/device-remove.c index 6b87f865e4..bd6d4062c9 100644 --- a/drivers/core/device-remove.c +++ b/drivers/core/device-remove.c @@ -61,6 +61,9 @@ int device_unbind(struct udevice *dev) if (dev->flags & DM_FLAG_ACTIVATED) return -EINVAL; + if (!(dev->flags & DM_FLAG_BOUND)) + return -EINVAL; + drv = dev->driver; assert(drv); @@ -92,6 +95,9 @@ int device_unbind(struct udevice *dev) if (dev->parent) list_del(&dev->sibling_node); + + devres_release_all(dev); + free(dev); return 0; @@ -125,6 +131,8 @@ void device_free(struct udevice *dev) dev->parent_priv = NULL; } } + + devres_release_probe(dev); } int device_remove(struct udevice *dev) |