summaryrefslogtreecommitdiffstats
path: root/drivers/acpi/scan.c
diff options
context:
space:
mode:
authorHolger Macht2008-02-14 13:40:34 +0100
committerLen Brown2008-02-21 13:25:47 +0100
commit3b5fee5952ff7eb6ff7a64247a01040b8b331b74 (patch)
treec73dfebf4d1df7ccde64420437f56f0e872fa9c6 /drivers/acpi/scan.c
parentFRV: Change the timerfd syscalls to be the same as i386 (diff)
downloadkernel-qcow2-linux-3b5fee5952ff7eb6ff7a64247a01040b8b331b74.tar.gz
kernel-qcow2-linux-3b5fee5952ff7eb6ff7a64247a01040b8b331b74.tar.xz
kernel-qcow2-linux-3b5fee5952ff7eb6ff7a64247a01040b8b331b74.zip
ACPI: Do not pass NULL to acpi_get_handle() when looking for _EJD
When trying to get the acpi_handle from an acpi_buffer, pass ACPI_ROOT_OBJECT instead of NULL to acpi_get_handle(). This fixes the detection of dock dependent bays. Signed-off-by: Holger Macht <hmacht@suse.de> Tested-by: Thomas Renninger <trenn@suse.de> Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'drivers/acpi/scan.c')
-rw-r--r--drivers/acpi/scan.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c
index 3fac011f9cf9..d9b914303b9c 100644
--- a/drivers/acpi/scan.c
+++ b/drivers/acpi/scan.c
@@ -609,7 +609,8 @@ acpi_bus_get_ejd(acpi_handle handle, acpi_handle *ejd)
status = acpi_evaluate_object(handle, "_EJD", NULL, &buffer);
if (ACPI_SUCCESS(status)) {
obj = buffer.pointer;
- status = acpi_get_handle(NULL, obj->string.pointer, ejd);
+ status = acpi_get_handle(ACPI_ROOT_OBJECT, obj->string.pointer,
+ ejd);
kfree(buffer.pointer);
}
return status;