Commit acf02d23 authored by Cornelia Huck's avatar Cornelia Huck Committed by Greg Kroah-Hartman

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: default avatarCornelia Huck <cornelia.huck@de.ibm.com>
Cc: Alan Stern <stern@rowland.harvard.edu>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 8a82472f
...@@ -1022,7 +1022,7 @@ int device_move(struct device *dev, struct device *new_parent) ...@@ -1022,7 +1022,7 @@ int device_move(struct device *dev, struct device *new_parent)
old_parent = dev->parent; old_parent = dev->parent;
dev->parent = new_parent; dev->parent = new_parent;
if (old_parent) if (old_parent)
klist_del(&dev->knode_parent); klist_remove(&dev->knode_parent);
klist_add_tail(&dev->knode_parent, &new_parent->klist_children); klist_add_tail(&dev->knode_parent, &new_parent->klist_children);
if (!dev->class) if (!dev->class)
goto out_put; goto out_put;
...@@ -1031,7 +1031,7 @@ int device_move(struct device *dev, struct device *new_parent) ...@@ -1031,7 +1031,7 @@ int device_move(struct device *dev, struct device *new_parent)
/* We ignore errors on cleanup since we're hosed anyway... */ /* We ignore errors on cleanup since we're hosed anyway... */
device_move_class_links(dev, new_parent, old_parent); device_move_class_links(dev, new_parent, old_parent);
if (!kobject_move(&dev->kobj, &old_parent->kobj)) { if (!kobject_move(&dev->kobj, &old_parent->kobj)) {
klist_del(&dev->knode_parent); klist_remove(&dev->knode_parent);
if (old_parent) if (old_parent)
klist_add_tail(&dev->knode_parent, klist_add_tail(&dev->knode_parent,
&old_parent->klist_children); &old_parent->klist_children);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment