From b789ef0e636e426cd0bf754323cde3c1260c0571 Mon Sep 17 00:00:00 2001
From: "Jon Medhurst (Tixy)" <tixy@linaro.org>
Date: Wed, 15 Aug 2012 22:11:00 +0200
Subject: [PATCH] --- yaml --- r: 321800 b: refs/heads/master c:
 5fbbb90dfdedb9a258550e4e5debd3013266372e h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 1620277db384..c9d6a0b7b201 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 63c6ba4352009a5f85b32307c001abeb5baebd28
+refs/heads/master: 5fbbb90dfdedb9a258550e4e5debd3013266372e
diff --git a/trunk/drivers/cpuidle/coupled.c b/trunk/drivers/cpuidle/coupled.c
index c24dda03c143..3265844839bf 100644
--- a/trunk/drivers/cpuidle/coupled.c
+++ b/trunk/drivers/cpuidle/coupled.c
@@ -693,7 +693,7 @@ static int cpuidle_coupled_cpu_notify(struct notifier_block *nb,
 	mutex_lock(&cpuidle_lock);
 
 	dev = per_cpu(cpuidle_devices, cpu);
-	if (!dev->coupled)
+	if (!dev || !dev->coupled)
 		goto out;
 
 	switch (action & ~CPU_TASKS_FROZEN) {