diff options
| author | Jesse Barnes | 2009-10-07 23:39:46 +0200 |
|---|---|---|
| committer | Len Brown | 2009-10-13 08:53:30 +0200 |
| commit | 2c907b72db4dd4e8af6dccb6e0ac122d78627b8d (patch) | |
| tree | 0a980ca3ea0020cc7145b62de382bc5ff2c81daf | |
| parent | fujitsu-laptop: address missed led-class ifdef fixup (diff) | |
| download | kernel-qcow2-linux-2c907b72db4dd4e8af6dccb6e0ac122d78627b8d.tar.gz kernel-qcow2-linux-2c907b72db4dd4e8af6dccb6e0ac122d78627b8d.tar.xz kernel-qcow2-linux-2c907b72db4dd4e8af6dccb6e0ac122d78627b8d.zip | |
ACPI button: don't try to use a non-existent lid device
If a call comes in to check the lid state but there's no lid device
present, we should return -ENODEV.
Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
Signed-off-by: Len Brown <len.brown@intel.com>
| -rw-r--r-- | drivers/acpi/button.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/acpi/button.c b/drivers/acpi/button.c index 9335b87c5174..0c9c6a9a002c 100644 --- a/drivers/acpi/button.c +++ b/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)) |