Merge with upstream to accommodate with thermal changes

[deliverable/linux.git] / drivers / base / driver.c

diff --git a/drivers/base/driver.c b/drivers/base/driver.c
index 3ec3896c83a659ac069a4d27a98f0bcdd193f78e..207c27ddf828392ef2ffb74ace6d0b4c8269282a 100644 (file)
--- a/drivers/base/driver.c
+++ b/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,