diff --git a/[refs] b/[refs]
index 604996d9b50d..ea89916e5f81 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6b2c676bf32be91f43215d5874c07c1becaba013
+refs/heads/master: c0d64cb031c21f163a0ec15cf10844bcf0ceedcf
diff --git a/trunk/drivers/cpuidle/driver.c b/trunk/drivers/cpuidle/driver.c
index 2257004fe33d..826b5c0aa12b 100644
--- a/trunk/drivers/cpuidle/driver.c
+++ b/trunk/drivers/cpuidle/driver.c
@@ -45,8 +45,11 @@ EXPORT_SYMBOL_GPL(cpuidle_register_driver);
  */
 void cpuidle_unregister_driver(struct cpuidle_driver *drv)
 {
-	if (!drv)
+	if (drv != cpuidle_curr_driver) {
+		WARN(1, "invalid cpuidle_unregister_driver(%s)\n",
+			drv->name);
 		return;
+	}
 
 	spin_lock(&cpuidle_driver_lock);
 	cpuidle_curr_driver = NULL;