diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-04-14 20:48:55 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-04-14 20:48:55 -0400 |
| commit | 2acab771b7e676125cb8c96b61dcdefe9ba67e57 (patch) | |
| tree | 86227af3c9ad0d90823e5488a86f7f453ed1837a /drivers/base/dd.c | |
| parent | 201e06279823c73242de987f192f43d2b30e5331 (diff) | |
| parent | 64541d19702cfdb7ea946fdc20faee849f6874b1 (diff) | |
Merge branch 'master'
Diffstat (limited to 'drivers/base/dd.c')
| -rw-r--r-- | drivers/base/dd.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/base/dd.c b/drivers/base/dd.c index 730a9ce0a14a..889c71111239 100644 --- a/drivers/base/dd.c +++ b/drivers/base/dd.c | |||
| @@ -209,7 +209,7 @@ static void __device_release_driver(struct device * dev) | |||
| 209 | sysfs_remove_link(&dev->kobj, "driver"); | 209 | sysfs_remove_link(&dev->kobj, "driver"); |
| 210 | klist_remove(&dev->knode_driver); | 210 | klist_remove(&dev->knode_driver); |
| 211 | 211 | ||
| 212 | if (dev->bus->remove) | 212 | if (dev->bus && dev->bus->remove) |
| 213 | dev->bus->remove(dev); | 213 | dev->bus->remove(dev); |
| 214 | else if (drv->remove) | 214 | else if (drv->remove) |
| 215 | drv->remove(dev); | 215 | drv->remove(dev); |