diff options
| author |   Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2025-08-14 13:09:27 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2025-08-14 13:09:27 +0200 |
| commit | 40f2f1aa62578547e2977e8c0516048e0b71018c (patch) | |
| tree | 5160e1fc54442b2e1c14c2c9a3c157e27a79e1e2 | |
| parent | ACPI: EC: Relax sanity check of the ECDT ID string (diff) | |
| parent | ACPI: processor: perflib: Move problematic pr->performance check (diff) | |
| download | wireguard-linux-40f2f1aa62578547e2977e8c0516048e0b71018c.tar.xz wireguard-linux-40f2f1aa62578547e2977e8c0516048e0b71018c.zip | |
Merge branches 'acpi-ec' and 'acpi-processor'
* acpi-ec:
ACPI: EC: Relax sanity check of the ECDT ID string
* acpi-processor:
ACPI: processor: perflib: Move problematic pr->performance check
| -rw-r--r-- | drivers/acpi/processor_perflib.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/acpi/processor_perflib.c b/drivers/acpi/processor_perflib.c index 755003bf3a45..8972446b7162 100644 --- a/drivers/acpi/processor_perflib.c +++ b/drivers/acpi/processor_perflib.c @@ -180,7 +180,7 @@ void acpi_processor_ppc_init(struct cpufreq_policy *policy) struct acpi_processor *pr = per_cpu(processors, cpu); int ret; - if (!pr || !pr->performance) + if (!pr) continue; /* @@ -197,6 +197,9 @@ void acpi_processor_ppc_init(struct cpufreq_policy *policy) pr_err("Failed to add freq constraint for CPU%d (%d)\n", cpu, ret); + if (!pr->performance) + continue; + ret = acpi_processor_get_platform_limit(pr); if (ret) pr_err("Failed to update freq constraint for CPU%d (%d)\n", |