[PATCH] Driver core: Use klist_del() instead of klist_remove().

Use klist_del() instead of klist_remove() when unregistering devices.
This will prevent a deadlock when executing a recursive unregister using
device_for_each_child().

Signed-off-by Patrick Mochel <mochel@digitalimplant.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

diff --git a/drivers/base/core.c b/drivers/base/core.c
index 86d79755fbfb9d4c62c572df8d0585200d1064bf..efe03a024a5bc39bf958881143d740312c3b09bc 100644 (file)
--- a/drivers/base/core.c
+++ b/drivers/base/core.c
@@ -333,7 +333,7 @@ void device_del(struct device * dev)
        struct device * parent = dev->parent;
 
        if (parent)
-               klist_remove(&dev->knode_parent);
+               klist_del(&dev->knode_parent);
 
        /* Notify the platform of the removal, in case they
         * need to do anything...