Merge branch 'pm-cpuidle'

* pm-cpuidle:
  cpuidle: Check the result of cpuidle_get_driver() against NULL

diff --git a/drivers/cpuidle/driver.c b/drivers/cpuidle/driver.c
index 3ac499d5a20784c0432e91f51575022f95c3d3d5..6e11701f0fcaef8430e2e8544108df8e337ebbed 100644 (file)
--- a/drivers/cpuidle/driver.c
+++ b/drivers/cpuidle/driver.c
@@ -331,7 +331,8 @@ struct cpuidle_driver *cpuidle_driver_ref(void)
        spin_lock(&cpuidle_driver_lock);
 
        drv = cpuidle_get_driver();
-       drv->refcnt++;
+       if (drv)
+               drv->refcnt++;
 
        spin_unlock(&cpuidle_driver_lock);
        return drv;