From 03ab655c338e5e1c919c3a42986ab5d6691f3786 Mon Sep 17 00:00:00 2001
From: Daniel Lezcano <daniel.lezcano@linaro.org>
Date: Wed, 31 Oct 2012 16:44:46 +0000
Subject: [PATCH] --- yaml --- r: 336733 b: refs/heads/master c:
 41682032715c2c969357c81391a442a24dd1c2c2 h: refs/heads/master i:   336731:
 0c127d02b1bddfa51d68ab4fc0e557a9491d8509 v: v3

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

diff --git a/[refs] b/[refs]
index 69f9b4cd05a6..b86f8adabdde 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 42f67f2acab2b7179c0d1ab234869e391448dfa6
+refs/heads/master: 41682032715c2c969357c81391a442a24dd1c2c2
diff --git a/trunk/drivers/cpuidle/driver.c b/trunk/drivers/cpuidle/driver.c
index 39ba8e181e96..3e5907569233 100644
--- a/trunk/drivers/cpuidle/driver.c
+++ b/trunk/drivers/cpuidle/driver.c
@@ -85,17 +85,9 @@ EXPORT_SYMBOL_GPL(cpuidle_get_driver);
  */
 void cpuidle_unregister_driver(struct cpuidle_driver *drv)
 {
-	if (drv != cpuidle_curr_driver) {
-		WARN(1, "invalid cpuidle_unregister_driver(%s)\n",
-			drv->name);
-		return;
-	}
-
 	spin_lock(&cpuidle_driver_lock);
-
-	if (!WARN_ON(drv->refcnt > 0))
+	if (drv == cpuidle_curr_driver && !WARN_ON(drv->refcnt > 0))
 		cpuidle_curr_driver = NULL;
-
 	spin_unlock(&cpuidle_driver_lock);
 }
 EXPORT_SYMBOL_GPL(cpuidle_unregister_driver);