diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2022-09-05 07:53:56 +0200 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2022-09-05 07:53:56 +0200 |
commit | 50e177c5bfd9abc3828cb57e14e6169170f6764a (patch) | |
tree | 180aafa376fb7a0a89c7d6812f640f8c46758bd5 /drivers/cpufreq/cpufreq.c | |
parent | misc: microchip: pci1xxxx: Add power management functions - suspend & resume ... (diff) | |
parent | Linux 6.0-rc4 (diff) | |
download | linux-50e177c5bfd9abc3828cb57e14e6169170f6764a.tar.xz linux-50e177c5bfd9abc3828cb57e14e6169170f6764a.zip |
Merge 6.0-rc4 into char-misc-next
We need the char-misc fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/cpufreq/cpufreq.c')
-rw-r--r-- | drivers/cpufreq/cpufreq.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/cpufreq/cpufreq.c b/drivers/cpufreq/cpufreq.c index 7820c4e74289..69b3d61852ac 100644 --- a/drivers/cpufreq/cpufreq.c +++ b/drivers/cpufreq/cpufreq.c @@ -532,7 +532,7 @@ static unsigned int __resolve_freq(struct cpufreq_policy *policy, target_freq = clamp_val(target_freq, policy->min, policy->max); - if (!cpufreq_driver->target_index) + if (!policy->freq_table) return target_freq; idx = cpufreq_frequency_table_target(policy, target_freq, relation); |