diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2016-10-30 06:12:50 +0100 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2016-10-30 06:12:50 +0100 |
| commit | fe0f59c41255d339f4f059be62c350c3c48a3f95 (patch) | |
| tree | fde2381bf94a14ea1553f88f9e9e37b45ed280dc /drivers/acpi/acpica/dswexec.c | |
| parent | cpufreq: intel_pstate: Always set max P-state in performance mode (diff) | |
| parent | Documentation: intel_pstate: PID tuning is not always available (diff) | |
| download | linux-fe0f59c41255d339f4f059be62c350c3c48a3f95.tar.xz linux-fe0f59c41255d339f4f059be62c350c3c48a3f95.zip | |
Merge back earlier cpufreq material for v4.10.
Diffstat (limited to 'drivers/acpi/acpica/dswexec.c')
| -rw-r--r-- | drivers/acpi/acpica/dswexec.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/acpi/acpica/dswexec.c b/drivers/acpi/acpica/dswexec.c index 402ecc590c56..438597cf6cc5 100644 --- a/drivers/acpi/acpica/dswexec.c +++ b/drivers/acpi/acpica/dswexec.c @@ -133,7 +133,8 @@ acpi_ds_get_predicate_value(struct acpi_walk_state *walk_state, * Result of predicate evaluation must be an Integer * object. Implicitly convert the argument if necessary. */ - status = acpi_ex_convert_to_integer(obj_desc, &local_obj_desc, 16); + status = acpi_ex_convert_to_integer(obj_desc, &local_obj_desc, + ACPI_STRTOUL_BASE16); if (ACPI_FAILURE(status)) { goto cleanup; } |