diff options
| author | Masahiro Yamada <yamada.masahiro@socionext.com> | 2015-04-24 17:28:40 +0900 |
|---|---|---|
| committer | Simon Glass <sjg@chromium.org> | 2015-04-28 16:49:02 -0600 |
| commit | f0f932d620ffc8b5a93fb457efbcfb3c0a7444f2 (patch) | |
| tree | 704fc721e502f1540015f2db9a7a59eb33f9fbf6 /drivers/core | |
| parent | cc555bd4f40a652471df4a3621d45ee57df0ca11 (diff) | |
| download | talos-obmc-uboot-f0f932d620ffc8b5a93fb457efbcfb3c0a7444f2.tar.gz talos-obmc-uboot-f0f932d620ffc8b5a93fb457efbcfb3c0a7444f2.zip | |
dm: core: drop device removal error path correctly
Trivial bug fix for commit 5a87c4174d18 (dm: core: Drop device
removal error path when not supported).
Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Acked-by: Simon Glass <sjg@chromium.org>
Diffstat (limited to 'drivers/core')
| -rw-r--r-- | drivers/core/device.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/core/device.c b/drivers/core/device.c index 3b77d231d3..85fd1fc735 100644 --- a/drivers/core/device.c +++ b/drivers/core/device.c @@ -135,7 +135,7 @@ int device_bind(struct udevice *parent, const struct driver *drv, return 0; fail_child_post_bind: - if (IS_ENABLED(DM_DEVICE_REMOVE)) { + if (IS_ENABLED(CONFIG_DM_DEVICE_REMOVE)) { if (drv->unbind && drv->unbind(dev)) { dm_warn("unbind() method failed on dev '%s' on error path\n", dev->name); @@ -143,14 +143,14 @@ fail_child_post_bind: } fail_bind: - if (IS_ENABLED(DM_DEVICE_REMOVE)) { + if (IS_ENABLED(CONFIG_DM_DEVICE_REMOVE)) { if (uclass_unbind_device(dev)) { dm_warn("Failed to unbind dev '%s' on error path\n", dev->name); } } fail_uclass_bind: - if (IS_ENABLED(DM_DEVICE_REMOVE)) { + if (IS_ENABLED(CONFIG_DM_DEVICE_REMOVE)) { list_del(&dev->sibling_node); if (dev->flags & DM_FLAG_ALLOC_PARENT_PDATA) { free(dev->parent_platdata); |
