diff --git a/[refs] b/[refs]
index 02d755e09285..f90c98b2fab1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 08119e8966e993993d0ba92b2fba38c582c8f787
+refs/heads/master: 29591b92e19f409d5ad4c099c2b7b5ea56f50dfa
diff --git a/trunk/drivers/base/bus.c b/trunk/drivers/base/bus.c
index be1cc5143354..ef522ae55480 100644
--- a/trunk/drivers/base/bus.c
+++ b/trunk/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);