diff options
| author | Len Brown <len.brown@intel.com> | 2010-08-14 23:57:32 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2010-08-14 23:57:32 -0400 |
| commit | e8eb6228094bcf0c84d9aa32b6363e78da68e1f5 (patch) | |
| tree | faebb2559bb45ba452dd596744b214326ee8281e /drivers/acpi | |
| parent | ecd8ee0955a2f21914c2e2ffff82541211c5bd43 (diff) | |
| parent | 108029ff84fcad8f9199d2d2e2583ae2747d45a4 (diff) | |
Merge branch 'bugzilla-16422' into release
Diffstat (limited to 'drivers/acpi')
| -rw-r--r-- | drivers/acpi/glue.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/acpi/glue.c b/drivers/acpi/glue.c index 4af6301601e7..78b0164c35b2 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) | |||
| 100 | 100 | ||
| 101 | status = acpi_get_object_info(handle, &info); | 101 | status = acpi_get_object_info(handle, &info); |
| 102 | if (ACPI_SUCCESS(status)) { | 102 | if (ACPI_SUCCESS(status)) { |
| 103 | if (info->address == find->address) | 103 | if ((info->address == find->address) |
| 104 | && (info->valid & ACPI_VALID_ADR)) | ||
| 104 | find->handle = handle; | 105 | find->handle = handle; |
| 105 | kfree(info); | 106 | kfree(info); |
| 106 | } | 107 | } |