summaryrefslogtreecommitdiffstats
path: root/drivers/acpi/acpica/nsconvert.c
diff options
context:
space:
mode:
authorBob Moore <robert.moore@intel.com>2016-03-24 09:40:33 +0800
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2016-04-05 03:53:33 +0200
commit3a05be7575a46cf3b16abb77e1072afa13307a1b (patch)
tree5a2db5243f2eb99315513b03171e10e8251a6377 /drivers/acpi/acpica/nsconvert.c
parent53c78d75d8a4615e5c2f1d9fe94f25e049f0e61b (diff)
downloadop-kernel-dev-3a05be7575a46cf3b16abb77e1072afa13307a1b.zip
op-kernel-dev-3a05be7575a46cf3b16abb77e1072afa13307a1b.tar.gz
ACPICA: Utilities: Update for strtoul64 merger
ACPICA commit 795e136d2ac77c1c8b091fba019b5fe36a44a323 Fixes a problem with the merger of the two internal versions of this function. Make the maximum integer width (32-bit or 64-bit) a parameter to the function so that it no longer exclusively uses the integer width specified in the DSDT/SSDT. ACPICA BZ 1260 Link: https://github.com/acpica/acpica/commit/795e136d Signed-off-by: Bob Moore <robert.moore@intel.com> Signed-off-by: Lv Zheng <lv.zheng@intel.com> Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Diffstat (limited to 'drivers/acpi/acpica/nsconvert.c')
-rw-r--r--drivers/acpi/acpica/nsconvert.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/acpi/acpica/nsconvert.c b/drivers/acpi/acpica/nsconvert.c
index 878e8fb..256f56c 100644
--- a/drivers/acpi/acpica/nsconvert.c
+++ b/drivers/acpi/acpica/nsconvert.c
@@ -79,7 +79,8 @@ acpi_ns_convert_to_integer(union acpi_operand_object *original_object,
/* String-to-Integer conversion */
status = acpi_ut_strtoul64(original_object->string.pointer,
- ACPI_ANY_BASE, &value);
+ ACPI_ANY_BASE,
+ acpi_gbl_integer_byte_width, &value);
if (ACPI_FAILURE(status)) {
return (status);
}
OpenPOWER on IntegriCloud