[U-Boot] [PATCH] dm: core: drop device removal error path correctly

[U-Boot] [PATCH] dm: core: drop device removal error path correctly

[Masahiro Yamada]

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>
---

 drivers/core/device.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/core/device.c b/drivers/core/device.c
index 3b77d23..85fd1fc 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);
-- 
1.9.1

[U-Boot] [PATCH] dm: core: drop device removal error path correctly

[Simon Glass]

On 24 April 2015 at 02:28, Masahiro Yamada
<yamada.masahiro@socionext.com> wrote:
> 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>
> ---
>
>  drivers/core/device.c | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)

Thanks Masahiro. Not enough test coverage around unbinding devices!

Acked-by: Simon Glass <sjg@chromium.org>

[U-Boot] [PATCH] dm: core: drop device removal error path correctly

[Simon Glass]

On 24 April 2015 at 07:04, Simon Glass <sjg@chromium.org> wrote:
> On 24 April 2015 at 02:28, Masahiro Yamada
> <yamada.masahiro@socionext.com> wrote:
>> 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>
>> ---
>>
>>  drivers/core/device.c | 6 +++---
>>  1 file changed, 3 insertions(+), 3 deletions(-)
>
> Thanks Masahiro. Not enough test coverage around unbinding devices!
>
> Acked-by: Simon Glass <sjg@chromium.org>

Applied to u-boot-dm, thanks!