From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Tue, 10 Sep 2013 21:15:29 +0000 (+0200)
Subject: Merge branch 'pm-cpuidle'
X-Git-Tag: firefly_0821_release~176^2~5323^2~3
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=1a7b0ecbbc1219895f48934ff5549a3594db3480;hp=416fd1ae87c2b8e40f2f39dc4bbe1a3d4d4391cd;p=firefly-linux-kernel-4.4.55.git

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 3ac499d5a207..6e11701f0fca 100644
--- 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;