diff options
| author | Len Brown <len.brown@intel.com> | 2009-10-15 00:47:13 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2009-10-15 00:47:13 -0400 |
| commit | d59733c1e56784a99381799021c4f9698f3e6379 (patch) | |
| tree | eee7c84624df2aedeefc9c6eef9577f4ef6d4da5 /drivers/acpi/button.c | |
| parent | 4697fd6f6a6277b33093fc807786f16cabe30b31 (diff) | |
| parent | 2c907b72db4dd4e8af6dccb6e0ac122d78627b8d (diff) | |
Merge branch 'misc' into release
Diffstat (limited to 'drivers/acpi/button.c')
| -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) | |||
| 251 | acpi_status status; | 251 | acpi_status status; |
| 252 | unsigned long long state; | 252 | unsigned long long state; |
| 253 | 253 | ||
| 254 | if (!lid_device) | ||
| 255 | return -ENODEV; | ||
| 256 | |||
| 254 | status = acpi_evaluate_integer(lid_device->handle, "_LID", NULL, | 257 | status = acpi_evaluate_integer(lid_device->handle, "_LID", NULL, |
| 255 | &state); | 258 | &state); |
| 256 | if (ACPI_FAILURE(status)) | 259 | if (ACPI_FAILURE(status)) |