aboutsummaryrefslogtreecommitdiff
path: root/drivers/base/bus.c
diff options
context:
space:
mode:
authorSteve French <sfrench@hera.kernel.org>2005-05-19 12:26:57 -0700
committerSteve French <sfrench@hera.kernel.org>2005-05-19 12:26:57 -0700
commit7e2987503dda95a5f80290bb8c06279009c2419e (patch)
treee841944c911ada8d2b806e13d2c7b7320adaeb2f /drivers/base/bus.c
parentb1a45695bde0204597957e448923f09ce271ca80 (diff)
parent49a43876b935c811cfd29d8fe998a6912a1cc5c4 (diff)
Merge with rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Diffstat (limited to 'drivers/base/bus.c')
-rw-r--r--drivers/base/bus.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/base/bus.c b/drivers/base/bus.c
index 2b3902c867d..3cb04bb04c2 100644
--- a/drivers/base/bus.c
+++ b/drivers/base/bus.c
@@ -390,7 +390,6 @@ void device_release_driver(struct device * dev)
sysfs_remove_link(&drv->kobj, kobject_name(&dev->kobj));
sysfs_remove_link(&dev->kobj, "driver");
list_del_init(&dev->driver_list);
- device_detach_shutdown(dev);
if (drv->remove)
drv->remove(dev);
dev->driver = NULL;