From 2bb3e1163834be214519715dd16da9385db20128 Mon Sep 17 00:00:00 2001
From: "Srivatsa S. Bhat" <srivatsa.bhat@linux.vnet.ibm.com>
Date: Mon, 8 Oct 2012 13:43:08 +0530
Subject: [PATCH] --- yaml --- r: 334195 b: refs/heads/master c:
 cf31cd1a0c692a1445c80756055875088fa29982 h: refs/heads/master i:   334193:
 2e26a03fe35c3d851a1433747e91cfc6f020aee9   334191:
 7364043a1a6f650fc6bbfb6a8f2323a297d18769 v: v3

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

diff --git a/[refs] b/[refs]
index f0d182cc9017..a49d45bef94c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e8b1b59dc8e42a47c4ce541bd1767ffac206b29c
+refs/heads/master: cf31cd1a0c692a1445c80756055875088fa29982
diff --git a/trunk/drivers/cpuidle/cpuidle.c b/trunk/drivers/cpuidle/cpuidle.c
index e28f6ea46f1a..7f15b8514a18 100644
--- a/trunk/drivers/cpuidle/cpuidle.c
+++ b/trunk/drivers/cpuidle/cpuidle.c
@@ -368,7 +368,7 @@ EXPORT_SYMBOL_GPL(cpuidle_enable_device);
  */
 void cpuidle_disable_device(struct cpuidle_device *dev)
 {
-	if (!dev->enabled)
+	if (!dev || !dev->enabled)
 		return;
 	if (!cpuidle_get_driver() || !cpuidle_curr_governor)
 		return;