diff --git a/[refs] b/[refs]
index 1973f3f277ad..a0ef3fe2332f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e5779a583ddb9916b37cfbb916dc53ec2eaf0b9b
+refs/heads/master: f48f3febb2cbfd0f2ecee7690835ba745c1034a4
diff --git a/trunk/drivers/base/bus.c b/trunk/drivers/base/bus.c
index 8547b780bb5a..11463c00451e 100644
--- a/trunk/drivers/base/bus.c
+++ b/trunk/drivers/base/bus.c
@@ -932,6 +932,7 @@ int bus_register(struct bus_type *bus)
 	kset_unregister(&bus->p->subsys);
 	kfree(bus->p);
 out:
+	bus->p = NULL;
 	return retval;
 }
 EXPORT_SYMBOL_GPL(bus_register);
@@ -953,6 +954,7 @@ void bus_unregister(struct bus_type *bus)
 	bus_remove_file(bus, &bus_attr_uevent);
 	kset_unregister(&bus->p->subsys);
 	kfree(bus->p);
+	bus->p = NULL;
 }
 EXPORT_SYMBOL_GPL(bus_unregister);
 
diff --git a/trunk/drivers/base/driver.c b/trunk/drivers/base/driver.c
index 1e2bda780e48..2889ad57e48b 100644
--- a/trunk/drivers/base/driver.c
+++ b/trunk/drivers/base/driver.c
@@ -216,6 +216,8 @@ int driver_register(struct device_driver *drv)
 	int ret;
 	struct device_driver *other;
 
+	BUG_ON(!drv->bus->p);
+
 	if ((drv->bus->probe && drv->probe) ||
 	    (drv->bus->remove && drv->remove) ||
 	    (drv->bus->shutdown && drv->shutdown))