diff options
| author | Cornelia Huck <cornelia.huck@de.ibm.com> | 2006-11-22 17:49:39 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2006-12-01 14:52:02 -0800 |
| commit | acf02d23b96efa92e7cff05987122ceeb37dd075 (patch) | |
| tree | 70db884d9e55e9737d311110410c6155e793f1b4 | |
| parent | 8a82472f86bf693b8e91ed56c9ca4f62fbbdcfa3 (diff) | |
| download | blackbird-op-linux-acf02d23b96efa92e7cff05987122ceeb37dd075.tar.gz blackbird-op-linux-acf02d23b96efa92e7cff05987122ceeb37dd075.zip | |
driver core: Use klist_remove() in device_move()
As pointed out by Alan Stern, device_move needs to use klist_remove which waits
until removal is complete.
Signed-off-by: Cornelia Huck <cornelia.huck@de.ibm.com>
Cc: Alan Stern <stern@rowland.harvard.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| -rw-r--r-- | drivers/base/core.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/base/core.c b/drivers/base/core.c index e4eaf46c4d93..e4b530ef757d 100644 --- a/drivers/base/core.c +++ b/drivers/base/core.c @@ -1022,7 +1022,7 @@ int device_move(struct device *dev, struct device *new_parent) old_parent = dev->parent; dev->parent = new_parent; if (old_parent) - klist_del(&dev->knode_parent); + klist_remove(&dev->knode_parent); klist_add_tail(&dev->knode_parent, &new_parent->klist_children); if (!dev->class) goto out_put; @@ -1031,7 +1031,7 @@ int device_move(struct device *dev, struct device *new_parent) /* We ignore errors on cleanup since we're hosed anyway... */ device_move_class_links(dev, new_parent, old_parent); if (!kobject_move(&dev->kobj, &old_parent->kobj)) { - klist_del(&dev->knode_parent); + klist_remove(&dev->knode_parent); if (old_parent) klist_add_tail(&dev->knode_parent, &old_parent->klist_children); |
