From 03b8a92fb18dc61ab62cd74458d4083fdb7faa3d Mon Sep 17 00:00:00 2001
From: Len Brown <len.brown@intel.com>
Date: Sat, 22 May 2010 16:34:10 -0400
Subject: [PATCH] --- yaml --- r: 199271 b: refs/heads/master c:
 c0d64cb031c21f163a0ec15cf10844bcf0ceedcf h: refs/heads/master i:   199269:
 11c997092ce73b879187e2b38938ce4d6be99922   199267:
 a0c4e8f592d93625dabed9aacdf3baa10bbacfd7   199263:
 b67d4d78452829f6e4eb64787ca748a71bd6fb5f v: v3

---
 [refs]                         | 2 +-
 trunk/drivers/cpuidle/driver.c | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

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;