---

yaml --- r: 321801 b: refs/heads/master c: 3735d52 h: refs/heads/master i: 321799: 2e5ba74 v: v3
git-mirror · Aug 17, 2012 · f389442 · f389442
1 parent b789ef0
commit f389442
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5fbbb90dfdedb9a258550e4e5debd3013266372e
+refs/heads/master: 3735d524da64b70b41c764359da36f88aded3610
diff --git a/trunk/drivers/idle/intel_idle.c b/trunk/drivers/idle/intel_idle.c
@@ -606,8 +606,9 @@ static int __init intel_idle_init(void)
 	intel_idle_cpuidle_driver_init();
 	retval = cpuidle_register_driver(&intel_idle_driver);
 	if (retval) {
+		struct cpuidle_driver *drv = cpuidle_get_driver();
 		printk(KERN_DEBUG PREFIX "intel_idle yielding to %s",
-			cpuidle_get_driver()->name);
+			drv ? drv->name : "none");
 		return retval;
 	}