aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorRafael J. Wysocki <rjw@sisk.pl>2008-04-22 16:57:50 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2008-04-22 20:40:36 -0400
commit29591b92e19f409d5ad4c099c2b7b5ea56f50dfa (patch)
tree0e3625c691318934f97f384d0cac862b13b29719 /drivers
parent08119e8966e993993d0ba92b2fba38c582c8f787 (diff)
bus_remove_device: be more careful about incomplete initialization
Prevent bus_remove_device() from crashing if dev->knode_bus has not been initialized before it's called. This can happen if the device_add() ended up breaking out early due to an error, for example. Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl> Acked-by: Greg Kroah-Hartman <gregkh@suse.de> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/base/bus.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/base/bus.c b/drivers/base/bus.c
index be1cc5143354..ef522ae55480 100644
--- a/drivers/base/bus.c
+++ b/drivers/base/bus.c
@@ -530,7 +530,8 @@ void bus_remove_device(struct device *dev)
530 sysfs_remove_link(&dev->bus->p->devices_kset->kobj, 530 sysfs_remove_link(&dev->bus->p->devices_kset->kobj,
531 dev->bus_id); 531 dev->bus_id);
532 device_remove_attrs(dev->bus, dev); 532 device_remove_attrs(dev->bus, dev);
533 klist_del(&dev->knode_bus); 533 if (klist_node_attached(&dev->knode_bus))
534 klist_del(&dev->knode_bus);
534 535
535 pr_debug("bus: '%s': remove device %s\n", 536 pr_debug("bus: '%s': remove device %s\n",
536 dev->bus->name, dev->bus_id); 537 dev->bus->name, dev->bus_id);