Commit faddf2f5 authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

Merge branch 'pm-cpufreq' 

* pm-cpufreq:
  cpufreq: conservative: fix requested_freq reduction issue
parents 63ff4d07 3baa976a

drivers/cpufreq/cpufreq_conservative.c

+6 −1
Original line number Diff line number Diff line
@@ -80,13 +80,18 @@ static void cs_check_cpu(int cpu, unsigned int load) 


	/* Check for frequency decrease */

	if (load < cs_tuners->down_threshold) {

		unsigned int freq_target;

		/*

		 * if we cannot reduce the frequency anymore, break out early

		 */

		if (policy->cur == policy->min)

			return;



		dbs_info->requested_freq -= get_freq_target(cs_tuners, policy);

		freq_target = get_freq_target(cs_tuners, policy);

		if (dbs_info->requested_freq > freq_target)

			dbs_info->requested_freq -= freq_target;

		else

			dbs_info->requested_freq = policy->min;



		__cpufreq_driver_target(policy, dbs_info->requested_freq,

				CPUFREQ_RELATION_L);