Merge remote-tracking branch 'sound-asoc/for-next'

[deliverable/linux.git] / drivers / acpi / acpica / exconcat.c

diff --git a/drivers/acpi/acpica/exconcat.c b/drivers/acpi/acpica/exconcat.c
index 2423fe03e879431292be2210d9bb903aea042b58..5429c2a6bc41159053e902bef311816b0b313093 100644 (file)
--- a/drivers/acpi/acpica/exconcat.c
+++ b/drivers/acpi/acpica/exconcat.c
@@ -156,7 +156,7 @@ acpi_ex_do_concatenate(union acpi_operand_object *operand0,
 
                status =
                    acpi_ex_convert_to_integer(local_operand1, &temp_operand1,
-                                              16);
+                                              ACPI_STRTOUL_BASE16);
                break;
 
        case ACPI_TYPE_BUFFER: