summaryrefslogtreecommitdiffstats
path: root/drivers/cpufreq
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2020-01-13 10:33:29 +0100
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2020-01-13 10:33:29 +0100
commit2c7a8bd6060c4e2d85e00170f5c695a3db73610f (patch)
treeccdf74e5caf923ce601aff84ee3ce52e3f531f66 /drivers/cpufreq
parentc936069fb59c008013affd5672f0f27db2e03005 (diff)
parent80e8b1e59f0399b94a6088bcb9477bd798cc5eba (diff)
downloadlinux-stable-2c7a8bd6060c4e2d85e00170f5c695a3db73610f.tar.gz
linux-stable-2c7a8bd6060c4e2d85e00170f5c695a3db73610f.tar.bz2
linux-stable-2c7a8bd6060c4e2d85e00170f5c695a3db73610f.zip
Merge back cpufreq fixes for v5.6.
Diffstat (limited to 'drivers/cpufreq')
-rw-r--r--drivers/cpufreq/cppc_cpufreq.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/drivers/cpufreq/cppc_cpufreq.c b/drivers/cpufreq/cppc_cpufreq.c
index 8d8da763adc5..a06777c35fc0 100644
--- a/drivers/cpufreq/cppc_cpufreq.c
+++ b/drivers/cpufreq/cppc_cpufreq.c
@@ -39,7 +39,7 @@
static struct cppc_cpudata **all_cpu_data;
struct cppc_workaround_oem_info {
- char oem_id[ACPI_OEM_ID_SIZE +1];
+ char oem_id[ACPI_OEM_ID_SIZE + 1];
char oem_table_id[ACPI_OEM_TABLE_ID_SIZE + 1];
u32 oem_revision;
};
@@ -93,9 +93,13 @@ static void cppc_check_hisi_workaround(void)
for (i = 0; i < ARRAY_SIZE(wa_info); i++) {
if (!memcmp(wa_info[i].oem_id, tbl->oem_id, ACPI_OEM_ID_SIZE) &&
!memcmp(wa_info[i].oem_table_id, tbl->oem_table_id, ACPI_OEM_TABLE_ID_SIZE) &&
- wa_info[i].oem_revision == tbl->oem_revision)
+ wa_info[i].oem_revision == tbl->oem_revision) {
apply_hisi_workaround = true;
+ break;
+ }
}
+
+ acpi_put_table(tbl);
}
/* Callback function used to retrieve the max frequency from DMI */