aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/acpi/acpica/evgpeblk.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/acpi/acpica/evgpeblk.c')
-rw-r--r--drivers/acpi/acpica/evgpeblk.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/acpi/acpica/evgpeblk.c b/drivers/acpi/acpica/evgpeblk.c
index 484cc0565d5b..f7b3d2af9401 100644
--- a/drivers/acpi/acpica/evgpeblk.c
+++ b/drivers/acpi/acpica/evgpeblk.c
@@ -408,7 +408,7 @@ acpi_ev_match_prw_and_gpe(acpi_handle obj_handle,
408 */ 408 */
409 obj_desc = pkg_desc->package.elements[0]; 409 obj_desc = pkg_desc->package.elements[0];
410 410
411 if (ACPI_GET_OBJECT_TYPE(obj_desc) == ACPI_TYPE_INTEGER) { 411 if (obj_desc->common.type == ACPI_TYPE_INTEGER) {
412 412
413 /* Use FADT-defined GPE device (from definition of _PRW) */ 413 /* Use FADT-defined GPE device (from definition of _PRW) */
414 414
@@ -417,14 +417,14 @@ acpi_ev_match_prw_and_gpe(acpi_handle obj_handle,
417 /* Integer is the GPE number in the FADT described GPE blocks */ 417 /* Integer is the GPE number in the FADT described GPE blocks */
418 418
419 gpe_number = (u32) obj_desc->integer.value; 419 gpe_number = (u32) obj_desc->integer.value;
420 } else if (ACPI_GET_OBJECT_TYPE(obj_desc) == ACPI_TYPE_PACKAGE) { 420 } else if (obj_desc->common.type == ACPI_TYPE_PACKAGE) {
421 421
422 /* Package contains a GPE reference and GPE number within a GPE block */ 422 /* Package contains a GPE reference and GPE number within a GPE block */
423 423
424 if ((obj_desc->package.count < 2) || 424 if ((obj_desc->package.count < 2) ||
425 (ACPI_GET_OBJECT_TYPE(obj_desc->package.elements[0]) != 425 ((obj_desc->package.elements[0])->common.type !=
426 ACPI_TYPE_LOCAL_REFERENCE) 426 ACPI_TYPE_LOCAL_REFERENCE)
427 || (ACPI_GET_OBJECT_TYPE(obj_desc->package.elements[1]) != 427 || ((obj_desc->package.elements[1])->common.type !=
428 ACPI_TYPE_INTEGER)) { 428 ACPI_TYPE_INTEGER)) {
429 goto cleanup; 429 goto cleanup;
430 } 430 }