summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLen Brown <len.brown@intel.com>2010-08-14 23:57:32 -0400
committerLen Brown <len.brown@intel.com>2010-08-14 23:57:32 -0400
commite8eb6228094bcf0c84d9aa32b6363e78da68e1f5 (patch)
treefaebb2559bb45ba452dd596744b214326ee8281e
parentecd8ee0955a2f21914c2e2ffff82541211c5bd43 (diff)
parent108029ff84fcad8f9199d2d2e2583ae2747d45a4 (diff)
downloadop-kernel-dev-e8eb6228094bcf0c84d9aa32b6363e78da68e1f5.zip
op-kernel-dev-e8eb6228094bcf0c84d9aa32b6363e78da68e1f5.tar.gz
Merge branch 'bugzilla-16422' into release
-rw-r--r--drivers/acpi/glue.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/acpi/glue.c b/drivers/acpi/glue.c
index 4af6301..78b0164 100644
--- a/drivers/acpi/glue.c
+++ b/drivers/acpi/glue.c
@@ -100,7 +100,8 @@ do_acpi_find_child(acpi_handle handle, u32 lvl, void *context, void **rv)
status = acpi_get_object_info(handle, &info);
if (ACPI_SUCCESS(status)) {
- if (info->address == find->address)
+ if ((info->address == find->address)
+ && (info->valid & ACPI_VALID_ADR))
find->handle = handle;
kfree(info);
}
OpenPOWER on IntegriCloud