summaryrefslogtreecommitdiffstats
path: root/drivers/base
diff options
context:
space:
mode:
authorPatrick Mochel <mochel@digitalimplant.org>2005-06-24 17:39:33 +0200
committerGreg Kroah-Hartman <gregkh@suse.de>2005-06-30 07:48:05 +0200
commitd62c0f9fd2d3943a3eca85b490d86e1605000ccb (patch)
treec9fc174992f7746f680becdeaa1bdb6924108c0f /drivers/base
parent[PATCH] driver core: change bus_rescan_devices to return void (diff)
downloadlinux-d62c0f9fd2d3943a3eca85b490d86e1605000ccb.tar.xz
linux-d62c0f9fd2d3943a3eca85b490d86e1605000ccb.zip
[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>
Diffstat (limited to 'drivers/base')
-rw-r--r--drivers/base/core.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/base/core.c b/drivers/base/core.c
index 86d79755fbfb..efe03a024a5b 100644
--- 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...