Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 57af67e4 authored by qctecmdr Service's avatar qctecmdr Service Committed by Gerrit - the friendly Code Review server
Browse files

Merge "lpm-levels: Remove check for non negative LPM level selected"

parents 8a5d3c95 8c6851ab

drivers/cpuidle/lpm-levels.c

+2 −3
Original line number Diff line number Diff line
@@ -606,7 +606,7 @@ static int cpu_power_select(struct cpuidle_device *dev, 
	struct power_params *pwr_params;



	if ((sleep_disabled && !cpu_isolated(dev->cpu)) || sleep_us < 0)

		return 0;

		return best_level;



	idx_restrict = cpu->nlevels + 1;
@@ -683,8 +683,7 @@ static int cpu_power_select(struct cpuidle_device *dev, 
	max_residency = pwr_params->max_residency;



	if ((predicted || (idx_restrict != (cpu->nlevels + 1)))

			&& ((best_level >= 0)

			&& (best_level < (cpu->nlevels-1)))) {

			&& (best_level < (cpu->nlevels-1))) {

		htime = predicted + cpu->tmr_add;

		if (htime == cpu->tmr_add)

			htime = idx_restrict_time;