Merge branch 'bugzilla-16422' into release

lenb · lenb · commit e8eb6228094b · 2010-08-14T23:57:32.000-04:00
diff --git 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);
 	}

Original file line number	Diff line number	Diff line change
`@@ -100,7 +100,8 @@ do_acpi_find_child(acpi_handle handle, u32 lvl, void context, void *rv)`
`100`	`100`
`101`	`101`	`status = acpi_get_object_info(handle, &info);`
`102`	`102`	`if (ACPI_SUCCESS(status)) {`
`103`		`- if (info->address == find->address)`
	`103`	`+ if ((info->address == find->address)`
	`104`	`+ && (info->valid & ACPI_VALID_ADR))`
`104`	`105`	`find->handle = handle;`
`105`	`106`	`kfree(info);`
`106`	`107`	`}`