leandrof/u-boot
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

dm: core: drop device removal error path correctly

Browse Source 
Trivial bug fix for commit 5a87c4174d (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>
This commit is contained in:
Masahiro Yamada 2015-04-24 17:28:40 +09:00 committed by Simon Glass
parent cc555bd4f4
commit f0f932d620
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/core/device.c
View File

@ -135,7 +135,7 @@ int device_bind(struct udevice *parent, const struct driver *drv,
return 0; return 0;
fail_child_post_bind: fail_child_post_bind:
if (IS_ENABLED(DM_DEVICE_REMOVE)) { if (IS_ENABLED(CONFIG_DM_DEVICE_REMOVE)) {
if (drv->unbind && drv->unbind(dev)) { if (drv->unbind && drv->unbind(dev)) {
dm_warn("unbind() method failed on dev '%s' on error path\n", dm_warn("unbind() method failed on dev '%s' on error path\n",
dev->name); dev->name);
@ -143,14 +143,14 @@ fail_child_post_bind:
} }
fail_bind: fail_bind:
if (IS_ENABLED(DM_DEVICE_REMOVE)) { if (IS_ENABLED(CONFIG_DM_DEVICE_REMOVE)) {
if (uclass_unbind_device(dev)) { if (uclass_unbind_device(dev)) {
dm_warn("Failed to unbind dev '%s' on error path\n", dm_warn("Failed to unbind dev '%s' on error path\n",
dev->name); dev->name);
} }
} }
fail_uclass_bind: fail_uclass_bind:
if (IS_ENABLED(DM_DEVICE_REMOVE)) { if (IS_ENABLED(CONFIG_DM_DEVICE_REMOVE)) {
list_del(&dev->sibling_node); list_del(&dev->sibling_node);
if (dev->flags & DM_FLAG_ALLOC_PARENT_PDATA) { if (dev->flags & DM_FLAG_ALLOC_PARENT_PDATA) {
free(dev->parent_platdata); free(dev->parent_platdata);