diff options
Diffstat (limited to 'drivers/acpi/acpica/exmisc.c')
-rw-r--r-- | drivers/acpi/acpica/exmisc.c | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/drivers/acpi/acpica/exmisc.c b/drivers/acpi/acpica/exmisc.c index 72a2a13b6d36..00bf29877574 100644 --- a/drivers/acpi/acpica/exmisc.c +++ b/drivers/acpi/acpica/exmisc.c | |||
@@ -105,7 +105,6 @@ acpi_ex_get_object_reference(union acpi_operand_object *obj_desc, | |||
105 | break; | 105 | break; |
106 | 106 | ||
107 | case ACPI_DESC_TYPE_NAMED: | 107 | case ACPI_DESC_TYPE_NAMED: |
108 | |||
109 | /* | 108 | /* |
110 | * A named reference that has already been resolved to a Node | 109 | * A named reference that has already been resolved to a Node |
111 | */ | 110 | */ |
@@ -261,20 +260,24 @@ acpi_ex_do_concatenate(union acpi_operand_object *operand0, | |||
261 | */ | 260 | */ |
262 | switch (operand0->common.type) { | 261 | switch (operand0->common.type) { |
263 | case ACPI_TYPE_INTEGER: | 262 | case ACPI_TYPE_INTEGER: |
263 | |||
264 | status = | 264 | status = |
265 | acpi_ex_convert_to_integer(operand1, &local_operand1, 16); | 265 | acpi_ex_convert_to_integer(operand1, &local_operand1, 16); |
266 | break; | 266 | break; |
267 | 267 | ||
268 | case ACPI_TYPE_STRING: | 268 | case ACPI_TYPE_STRING: |
269 | |||
269 | status = acpi_ex_convert_to_string(operand1, &local_operand1, | 270 | status = acpi_ex_convert_to_string(operand1, &local_operand1, |
270 | ACPI_IMPLICIT_CONVERT_HEX); | 271 | ACPI_IMPLICIT_CONVERT_HEX); |
271 | break; | 272 | break; |
272 | 273 | ||
273 | case ACPI_TYPE_BUFFER: | 274 | case ACPI_TYPE_BUFFER: |
275 | |||
274 | status = acpi_ex_convert_to_buffer(operand1, &local_operand1); | 276 | status = acpi_ex_convert_to_buffer(operand1, &local_operand1); |
275 | break; | 277 | break; |
276 | 278 | ||
277 | default: | 279 | default: |
280 | |||
278 | ACPI_ERROR((AE_INFO, "Invalid object type: 0x%X", | 281 | ACPI_ERROR((AE_INFO, "Invalid object type: 0x%X", |
279 | operand0->common.type)); | 282 | operand0->common.type)); |
280 | status = AE_AML_INTERNAL; | 283 | status = AE_AML_INTERNAL; |
@@ -519,6 +522,7 @@ acpi_ex_do_logical_numeric_op(u16 opcode, | |||
519 | break; | 522 | break; |
520 | 523 | ||
521 | default: | 524 | default: |
525 | |||
522 | status = AE_AML_INTERNAL; | 526 | status = AE_AML_INTERNAL; |
523 | break; | 527 | break; |
524 | } | 528 | } |
@@ -580,20 +584,24 @@ acpi_ex_do_logical_op(u16 opcode, | |||
580 | */ | 584 | */ |
581 | switch (operand0->common.type) { | 585 | switch (operand0->common.type) { |
582 | case ACPI_TYPE_INTEGER: | 586 | case ACPI_TYPE_INTEGER: |
587 | |||
583 | status = | 588 | status = |
584 | acpi_ex_convert_to_integer(operand1, &local_operand1, 16); | 589 | acpi_ex_convert_to_integer(operand1, &local_operand1, 16); |
585 | break; | 590 | break; |
586 | 591 | ||
587 | case ACPI_TYPE_STRING: | 592 | case ACPI_TYPE_STRING: |
593 | |||
588 | status = acpi_ex_convert_to_string(operand1, &local_operand1, | 594 | status = acpi_ex_convert_to_string(operand1, &local_operand1, |
589 | ACPI_IMPLICIT_CONVERT_HEX); | 595 | ACPI_IMPLICIT_CONVERT_HEX); |
590 | break; | 596 | break; |
591 | 597 | ||
592 | case ACPI_TYPE_BUFFER: | 598 | case ACPI_TYPE_BUFFER: |
599 | |||
593 | status = acpi_ex_convert_to_buffer(operand1, &local_operand1); | 600 | status = acpi_ex_convert_to_buffer(operand1, &local_operand1); |
594 | break; | 601 | break; |
595 | 602 | ||
596 | default: | 603 | default: |
604 | |||
597 | status = AE_AML_INTERNAL; | 605 | status = AE_AML_INTERNAL; |
598 | break; | 606 | break; |
599 | } | 607 | } |
@@ -636,6 +644,7 @@ acpi_ex_do_logical_op(u16 opcode, | |||
636 | break; | 644 | break; |
637 | 645 | ||
638 | default: | 646 | default: |
647 | |||
639 | status = AE_AML_INTERNAL; | 648 | status = AE_AML_INTERNAL; |
640 | break; | 649 | break; |
641 | } | 650 | } |
@@ -703,6 +712,7 @@ acpi_ex_do_logical_op(u16 opcode, | |||
703 | break; | 712 | break; |
704 | 713 | ||
705 | default: | 714 | default: |
715 | |||
706 | status = AE_AML_INTERNAL; | 716 | status = AE_AML_INTERNAL; |
707 | break; | 717 | break; |
708 | } | 718 | } |