Merge branch 'bugzilla-16422' into release

e8eb6228 · Len Brown · ecd8ee09 · 108029ff · e8eb6228
Commit e8eb6228 authored Aug 14, 2010 by Len Brown
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

drivers/acpi/glue.c drivers/acpi/glue.c +2 -1

No files found.
--- 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);
 	}