---

yaml --- r: 334195 b: refs/heads/master c: cf31cd1 h: refs/heads/master i: 334193: 2e26a03 334191: 7364043 v: v3
git-mirror · Oct 9, 2012 · 2bb3e11 · 2bb3e11
1 parent 61e6dc3
commit 2bb3e11
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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;