diff --git a/[refs] b/[refs]
index cc5d4a57cc3a..488d4e40a830 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3ce9a7c0ac28561567fadedf1a99272e4970f740
+refs/heads/master: 094e47e9fa79e28f0e51e37400ea6eea35a4ee1f
diff --git a/trunk/drivers/base/driver.c b/trunk/drivers/base/driver.c
index 3ec3896c83a6..207c27ddf828 100644
--- a/trunk/drivers/base/driver.c
+++ b/trunk/drivers/base/driver.c
@@ -80,7 +80,7 @@ struct device *driver_find_device(struct device_driver *drv,
 	struct klist_iter i;
 	struct device *dev;
 
-	if (!drv)
+	if (!drv || !drv->p)
 		return NULL;
 
 	klist_iter_init_node(&drv->p->klist_devices, &i,