summaryrefslogtreecommitdiff
path: root/drivers/base/bus.c
diff options
context:
space:
mode:
author <jgarzik@pretzel.yyz.us>2005-05-26 13:03:24 -0400
committerJeff Garzik <jgarzik@pobox.com>2005-05-26 13:03:24 -0400
commit8973a585aec125beb2a3de50bb491004299f53d5 (patch)
tree3f069a9c7eff2c916e02427fd9800ce2b55a4a90 /drivers/base/bus.c
parent907f4678c114a125fe4584758681c31bf3d627da (diff)
parentbef9c558841604116704e10b3d9ff3dbf4939423 (diff)
downloadlinux-rt-8973a585aec125beb2a3de50bb491004299f53d5.tar.gz
Automatic merge of rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git branch HEAD
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 2b3902c867da..3cb04bb04c2b 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;