X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=drivers%2Fbase%2Fbus.c;h=ef522ae5548092f83ddabcbf36d7a54ad56f7282;hb=0599ad53fee2d084f9ba26247d7452f06a40d298;hp=be1cc514335456c64622304836558b6f0d102a28;hpb=e80ab411e589e00550e2e6e5a6a02d59cc730357;p=linux-2.6

diff --git a/drivers/base/bus.c b/drivers/base/bus.c
index be1cc51433..ef522ae554 100644
--- a/drivers/base/bus.c
+++ b/drivers/base/bus.c
@@ -530,7 +530,8 @@ void bus_remove_device(struct device *dev)
 		sysfs_remove_link(&dev->bus->p->devices_kset->kobj,
 				  dev->bus_id);
 		device_remove_attrs(dev->bus, dev);
-		klist_del(&dev->knode_bus);
+		if (klist_node_attached(&dev->knode_bus))
+			klist_del(&dev->knode_bus);
 
 		pr_debug("bus: '%s': remove device %s\n",
 			 dev->bus->name, dev->bus_id);