From 0e0d8b10c9dbb91862d0a10a9cad0b1fc060b2d1 Mon Sep 17 00:00:00 2001
From: Jesse Barnes <jbarnes@virtuousgeek.org>
Date: Wed, 7 Oct 2009 14:39:46 -0700
Subject: [PATCH] --- yaml --- r: 167613 b: refs/heads/master c:
 2c907b72db4dd4e8af6dccb6e0ac122d78627b8d h: refs/heads/master i:   167611:
 61c1e6f7d5230920dce7f836a118bcd785d20367 v: v3

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

diff --git a/[refs] b/[refs]
index f16692d4d9aa..e9ddf3aac72b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2906206350b7e13e2047467cc29a0a2d78d71cb2
+refs/heads/master: 2c907b72db4dd4e8af6dccb6e0ac122d78627b8d
diff --git a/trunk/drivers/acpi/button.c b/trunk/drivers/acpi/button.c
index 9335b87c5174..0c9c6a9a002c 100644
--- a/trunk/drivers/acpi/button.c
+++ b/trunk/drivers/acpi/button.c
@@ -251,6 +251,9 @@ int acpi_lid_open(void)
 	acpi_status status;
 	unsigned long long state;
 
+	if (!lid_device)
+		return -ENODEV;
+
 	status = acpi_evaluate_integer(lid_device->handle, "_LID", NULL,
 				       &state);
 	if (ACPI_FAILURE(status))