diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2021-03-08 19:10:07 +0100 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2021-03-08 19:10:07 +0100 |
| commit | a030fee8db446aaf928c9c0960a21e319886ffdc (patch) | |
| tree | 560e472a5196d937b03eb0acfd16d149f27c3a9f /drivers/acpi | |
| parent | 3aadd86e5669f6bdb7c082e06c0ffadb4f987375 (diff) | |
| parent | 2c25fabdd5f69fb3d33b052dbb21c4d2d9ae4308 (diff) | |
| download | linux-stable-a030fee8db446aaf928c9c0960a21e319886ffdc.tar.gz linux-stable-a030fee8db446aaf928c9c0960a21e319886ffdc.tar.bz2 linux-stable-a030fee8db446aaf928c9c0960a21e319886ffdc.zip | |
Merge branch 'acpi-processor'
Merge topic branch depended on by the following material.
Diffstat (limited to 'drivers/acpi')
| -rw-r--r-- | drivers/acpi/processor_perflib.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/drivers/acpi/processor_perflib.c b/drivers/acpi/processor_perflib.c index e4032b7c3133..686b23fb968c 100644 --- a/drivers/acpi/processor_perflib.c +++ b/drivers/acpi/processor_perflib.c @@ -63,14 +63,15 @@ static int acpi_processor_get_platform_limit(struct acpi_processor *pr) * (e.g. 0 = states 0..n; 1 = states 1..n; etc. */ status = acpi_evaluate_integer(pr->handle, "_PPC", NULL, &ppc); - - if (status != AE_NOT_FOUND) + if (status != AE_NOT_FOUND) { acpi_processor_ppc_in_use = true; - if (ACPI_FAILURE(status) && status != AE_NOT_FOUND) { - acpi_handle_warn(pr->handle, "_PPC evaluation failed: %s\n", - acpi_format_exception(status)); - return -ENODEV; + if (ACPI_FAILURE(status)) { + acpi_handle_warn(pr->handle, + "_PPC evaluation failed: %s\n", + acpi_format_exception(status)); + return -ENODEV; + } } pr_debug("CPU %d: _PPC is %d - frequency %s limited\n", pr->id, |