From 20b9f6d230b3a737d05ff5ff9c34ae04e2f9f46b Mon Sep 17 00:00:00 2001
From: Kevin Hilman <khilman@deeprootsystems.com>
Date: Mon, 26 Oct 2009 16:50:18 -0700
Subject: [PATCH] --- yaml --- r: 167768 b: refs/heads/master c:
 246eb7f0ed1a8aeddec5313137767658f378949b h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 8227f9f3d491..fe99e072c4a8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5e8d8f6f2844d4a663415c660ab5cc92e2e2477d
+refs/heads/master: 246eb7f0ed1a8aeddec5313137767658f378949b
diff --git a/trunk/drivers/cpuidle/cpuidle.c b/trunk/drivers/cpuidle/cpuidle.c
index ad41f19b8e3f..12fdd3987a36 100644
--- a/trunk/drivers/cpuidle/cpuidle.c
+++ b/trunk/drivers/cpuidle/cpuidle.c
@@ -76,8 +76,11 @@ static void cpuidle_idle_call(void)
 #endif
 	/* ask the governor for the next state */
 	next_state = cpuidle_curr_governor->select(dev);
-	if (need_resched())
+	if (need_resched()) {
+		local_irq_enable();
 		return;
+	}
+
 	target_state = &dev->states[next_state];
 
 	/* enter the state and update stats */