diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-10-15 18:10:27 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-10-15 18:10:27 -0400 |
| commit | bd72f85b9ad6cf41bc771de0cd27d892c41b4396 (patch) | |
| tree | 3fd0909295dd427c4016dd8c09fae0050e007512 /drivers/acpi/button.c | |
| parent | 13e356c977473baeb29e8abfd992f0cd938a78ce (diff) | |
| parent | d59733c1e56784a99381799021c4f9698f3e6379 (diff) | |
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6
* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6:
ACPI button: don't try to use a non-existent lid device
ACPI: video: Loosen strictness of video bus detection code
eeepc-laptop: Prevent a panic when disabling RT2860 wireless when associated
eeepc-laptop: Properly annote eeepc_enable_camera().
ACPI / PCI: Fix NULL pointer dereference in acpi_get_pci_dev() (rev. 2)
fujitsu-laptop: address missed led-class ifdef fixup
ACPI: Kconfig, fix proc aggregator text
ACPI: add AC/DC notifier
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)) |