From 7f4d04bd58766b129a50b02ef2f69faa38c93356 Mon Sep 17 00:00:00 2001 From: Benjamin Herrenschmidt Date: Wed, 8 Nov 2006 19:46:14 -0800 Subject: [PATCH] --- yaml --- r: 41195 b: refs/heads/master c: 289535334646796fe41f199718e4a731f7411a92 h: refs/heads/master i: 41193: dd2f87052be0b7efeece75b8ebb53a62744d9ea7 41191: 6494252a1b4b96ebf45be64a294275fcc50061bf v: v3 --- [refs] | 2 +- trunk/drivers/base/core.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 733f9f001898..39dfbe406734 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 465ae641e4a3e5028aa9c85d3843259aa28a22ce +refs/heads/master: 289535334646796fe41f199718e4a731f7411a92 diff --git a/trunk/drivers/base/core.c b/trunk/drivers/base/core.c index f544adc5a5e2..5d11bbdfbd2f 100644 --- a/trunk/drivers/base/core.c +++ b/trunk/drivers/base/core.c @@ -682,6 +682,7 @@ void device_del(struct device * dev) device_remove_file(dev, &dev->uevent_attr); device_remove_groups(dev); device_remove_attrs(dev); + bus_remove_device(dev); /* Notify the platform of the removal, in case they * need to do anything... @@ -691,7 +692,6 @@ void device_del(struct device * dev) if (dev->bus) blocking_notifier_call_chain(&dev->bus->bus_notifier, BUS_NOTIFY_DEL_DEVICE, dev); - bus_remove_device(dev); device_pm_remove(dev); kobject_uevent(&dev->kobj, KOBJ_REMOVE); kobject_del(&dev->kobj);