diff options
| author | James Bottomley <jejb@mulgrave.il.steeleye.com> | 2006-06-10 14:47:26 -0400 |
|---|---|---|
| committer | James Bottomley <jejb@mulgrave.il.steeleye.com> | 2006-06-10 14:47:26 -0400 |
| commit | f0cd91a68acdc9b49d7f6738b514a426da627649 (patch) | |
| tree | 8ad73564015794197583b094217ae0a71e71e753 /drivers/base/dd.c | |
| parent | 60eef25701d25e99c991dd0f4a9f3832a0c3ad3e (diff) | |
| parent | 128e6ced247cda88f96fa9f2e4ba8b2c4a681560 (diff) | |
Merge ../linux-2.6
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); |