diff options
author | Len Brown <len.brown@intel.com> | 2008-02-07 03:11:56 -0500 |
---|---|---|
committer | Len Brown <len.brown@intel.com> | 2008-02-07 03:11:56 -0500 |
commit | d870ec7281d8429ab17d2e0324f4d8ca3f3de62d (patch) | |
tree | 2cb8ec870117e33535db21a8bb5fc6f4f4459124 /drivers/acpi | |
parent | 7924e4f6519dd5b349ed146fe9fe35206730be67 (diff) | |
parent | 02f8a8586574350a1f3c2cee79cbc0faf630961d (diff) |
Merge branches 'release' and 'hp-cid' into release
Diffstat (limited to 'drivers/acpi')
-rw-r--r-- | drivers/acpi/namespace/nsxfeval.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/drivers/acpi/namespace/nsxfeval.c b/drivers/acpi/namespace/nsxfeval.c index f39fbc6b9237..b92133faf5b7 100644 --- a/drivers/acpi/namespace/nsxfeval.c +++ b/drivers/acpi/namespace/nsxfeval.c | |||
@@ -443,6 +443,7 @@ acpi_ns_get_device_callback(acpi_handle obj_handle, | |||
443 | struct acpica_device_id hid; | 443 | struct acpica_device_id hid; |
444 | struct acpi_compatible_id_list *cid; | 444 | struct acpi_compatible_id_list *cid; |
445 | acpi_native_uint i; | 445 | acpi_native_uint i; |
446 | int found; | ||
446 | 447 | ||
447 | status = acpi_ut_acquire_mutex(ACPI_MTX_NAMESPACE); | 448 | status = acpi_ut_acquire_mutex(ACPI_MTX_NAMESPACE); |
448 | if (ACPI_FAILURE(status)) { | 449 | if (ACPI_FAILURE(status)) { |
@@ -496,16 +497,19 @@ acpi_ns_get_device_callback(acpi_handle obj_handle, | |||
496 | 497 | ||
497 | /* Walk the CID list */ | 498 | /* Walk the CID list */ |
498 | 499 | ||
500 | found = 0; | ||
499 | for (i = 0; i < cid->count; i++) { | 501 | for (i = 0; i < cid->count; i++) { |
500 | if (ACPI_STRNCMP(cid->id[i].value, info->hid, | 502 | if (ACPI_STRNCMP(cid->id[i].value, info->hid, |
501 | sizeof(struct | 503 | sizeof(struct |
502 | acpi_compatible_id)) != | 504 | acpi_compatible_id)) == |
503 | 0) { | 505 | 0) { |
504 | ACPI_FREE(cid); | 506 | found = 1; |
505 | return (AE_OK); | 507 | break; |
506 | } | 508 | } |
507 | } | 509 | } |
508 | ACPI_FREE(cid); | 510 | ACPI_FREE(cid); |
511 | if (!found) | ||
512 | return (AE_OK); | ||
509 | } | 513 | } |
510 | } | 514 | } |
511 | 515 | ||