From 8cdc42a471aec35733b9b8df72da6fff6e8e29d8 Mon Sep 17 00:00:00 2001 From: Cornelia Huck Date: Wed, 22 Nov 2006 17:49:39 +0100 Subject: [PATCH] --- yaml --- r: 41201 b: refs/heads/master c: acf02d23b96efa92e7cff05987122ceeb37dd075 h: refs/heads/master i: 41199: 9de893c5643ddfb100e2df824f002348d227ec88 v: v3 --- [refs] | 2 +- trunk/drivers/base/core.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 54dd684d9212..76374b2597c1 100644 --- 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 index e4eaf46c4d93..e4b530ef757d 100644 --- 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);