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>

diff --git a/drivers/core/device.c b/drivers/core/device.c
index 3b77d231d344d05d24047593f77bf9bbcfb49bc0..85fd1fc7350331d48721539cbb42ca5ae33f8206 100644 (file)
--- 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);