diff options
| author | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-05-18 19:37:46 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-05-18 19:37:46 -0400 |
| commit | 05d3794aa8bd3b2c9f7920a05003c331cdeb75c5 (patch) | |
| tree | 46ae0ec07caf01fa5c743112ae8ee932d1e66854 /drivers/base/bus.c | |
| parent | 301216244b1e39c4346e56d38b079ca53d528580 (diff) | |
| parent | 0b405a0f7e4d4d18fd1fe46ddf5ff465443036ab (diff) | |
Automatic merge of rsync://rsync.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-2.6.git/
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) | |||
| 390 | sysfs_remove_link(&drv->kobj, kobject_name(&dev->kobj)); | 390 | sysfs_remove_link(&drv->kobj, kobject_name(&dev->kobj)); |
| 391 | sysfs_remove_link(&dev->kobj, "driver"); | 391 | sysfs_remove_link(&dev->kobj, "driver"); |
| 392 | list_del_init(&dev->driver_list); | 392 | list_del_init(&dev->driver_list); |
| 393 | device_detach_shutdown(dev); | ||
| 394 | if (drv->remove) | 393 | if (drv->remove) |
| 395 | drv->remove(dev); | 394 | drv->remove(dev); |
| 396 | dev->driver = NULL; | 395 | dev->driver = NULL; |