---

yaml --- r: 41201 b: refs/heads/master c: acf02d2 h: refs/heads/master i: 41199: 9de893c v: v3
git-mirror · Dec 1, 2006 · 8cdc42a · 8cdc42a
1 parent 3407e62
commit 8cdc42a
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8a82472f86bf693b8e91ed56c9ca4f62fbbdcfa3
+refs/heads/master: acf02d23b96efa92e7cff05987122ceeb37dd075
diff --git a/trunk/drivers/base/core.c b/trunk/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);