From ee7de6a4e4d8be8f7efa7ef5ddfc2e6093a0fd51 Mon Sep 17 00:00:00 2001
From: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Date: Wed, 16 Jan 2013 23:40:07 +0100
Subject: [PATCH] --- yaml --- r: 349075 b: refs/heads/master c:
 b88a634a903d9670aa5f2f785aa890628ce0dece h: refs/heads/master i:   349073:
 dce045f475c1583b7b262f5148547dbc11ccde83   349071:
 b9ddeb184ba1a1fd9bda2e69d7e7ea25a3252f63 v: v3

---
 [refs]                              | 2 +-
 trunk/drivers/acpi/processor_idle.c | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index a529c6282474..b64231112440 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6f8c2e7933679f54b6478945dc72e59ef9a3d5e0
+refs/heads/master: b88a634a903d9670aa5f2f785aa890628ce0dece
diff --git a/trunk/drivers/acpi/processor_idle.c b/trunk/drivers/acpi/processor_idle.c
index f1a5da44591d..fea6f8d71fa3 100644
--- a/trunk/drivers/acpi/processor_idle.c
+++ b/trunk/drivers/acpi/processor_idle.c
@@ -958,6 +958,9 @@ static int acpi_processor_setup_cpuidle_cx(struct acpi_processor *pr)
 		return -EINVAL;
 	}
 
+	if (!dev)
+		return -EINVAL;
+
 	dev->cpu = pr->id;
 
 	if (max_cstate == 0)