diff options
| author |   Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2017-12-20 15:51:26 +0100 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2017-12-20 15:51:26 +0100 |
| commit | 9245fe9fccdbda5d81d97155e5c5de7e16510cee (patch) | |
| tree | 36608a38797c60a8361a03f19b30595e06ee83ee /drivers/acpi | |
| parent | ACPI: APEI / ERST: Fix missing error handling in erst_reader() (diff) | |
| parent | ACPI: CPPC: remove initial assignment of pcc_ss_data (diff) | |
| download | linux-dev-9245fe9fccdbda5d81d97155e5c5de7e16510cee.tar.xz linux-dev-9245fe9fccdbda5d81d97155e5c5de7e16510cee.zip | |
Merge branch 'acpi-cppc'
* acpi-cppc:
ACPI: CPPC: remove initial assignment of pcc_ss_data
Diffstat (limited to 'drivers/acpi')
| -rw-r--r-- | drivers/acpi/cppc_acpi.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/acpi/cppc_acpi.c b/drivers/acpi/cppc_acpi.c index 30e84cc600ae..06ea4749ebd9 100644 --- a/drivers/acpi/cppc_acpi.c +++ b/drivers/acpi/cppc_acpi.c @@ -1171,7 +1171,7 @@ int cppc_set_perf(int cpu, struct cppc_perf_ctrls *perf_ctrls) struct cpc_desc *cpc_desc = per_cpu(cpc_desc_ptr, cpu); struct cpc_register_resource *desired_reg; int pcc_ss_id = per_cpu(cpu_pcc_subspace_idx, cpu); - struct cppc_pcc_data *pcc_ss_data = pcc_data[pcc_ss_id]; + struct cppc_pcc_data *pcc_ss_data; int ret = 0; if (!cpc_desc || pcc_ss_id < 0) { |