diff options
| author | Grant Likely <grant.likely@secretlab.ca> | 2009-11-23 16:49:36 -0500 |
|---|---|---|
| committer | Grant Likely <grant.likely@secretlab.ca> | 2009-11-23 16:49:36 -0500 |
| commit | 2cfcadde83b308240690ff1c18f117d8bc7a08b0 (patch) | |
| tree | aa0795966d070d1f7a5221232d9ba47744bddb5f /drivers/acpi/button.c | |
| parent | e91edcf5a2940bb7f1f316c871dfe9e2aaf9d6d9 (diff) | |
| parent | 648f4e3e50c4793d9dbf9a09afa193631f76fa26 (diff) | |
Merge commit 'v2.6.32-rc8'
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)) |