Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

driver core: Use klist_remove() in device_move()

Browse source 
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:
Cornelia Huck 2006-11-22 17:49:39 +01:00 committed by Greg Kroah-Hartman
parent 8a82472f86
commit acf02d23b9
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
drivers/base/core.c
View file

@ -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)
/* 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);