diff options
author | <jgarzik@pretzel.yyz.us> | 2005-05-27 22:08:07 -0400 |
---|---|---|
committer | Jeff Garzik <jgarzik@pobox.com> | 2005-05-27 22:08:07 -0400 |
commit | 51a730d758ae4052e10ca7e06336f10af598c4fc (patch) | |
tree | b76a004c00cd7139659be515ee03398e47067290 /drivers/base/bus.c | |
parent | 6cd15a9daf826115356f9403494c76e5aafa7793 (diff) | |
parent | ff0e0ea2f5d36fa90fc2c57fd019102b0a0cfabf (diff) |
Automatic merge of /spare/repo/netdev-2.6 branch we18-ieee80211
Diffstat (limited to 'drivers/base/bus.c')
-rw-r--r-- | drivers/base/bus.c | 1 |
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; |