Commit b98f602d authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'pm-6.0-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm 

Pull power management fix from Rafael Wysocki:
 "Make __resolve_freq() check the presence of the frequency table
  instead of checking whether or not the ->target_index() callback is
  implemented by the driver, because that need not be the case when
  __resolve_freq() is used (Lukasz Luba)"

* tag 'pm-6.0-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
  cpufreq: check only freq_table in __resolve_freq()
parents 2b1ddb59 6ca7076f

drivers/cpufreq/cpufreq.c

+1 −1
Original line number Diff line number Diff line
@@ -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);