mirror of
https://mirrors.bfsu.edu.cn/git/linux.git
synced 2024-11-15 00:04:15 +08:00
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>
This commit is contained in:
parent
8a82472f86
commit
acf02d23b9
@ -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);
|
||||
|
Loading…
Reference in New Issue
Block a user