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

Commit 063a5d01 authored by Jean Pihet's avatar Jean Pihet Committed by Kevin Hilman
Browse files

ARM: OMAP3: PM: cpuidle: default to C1 in next_valid_state 



If the next state is no found in the next_valid_state function,
fallback to the default value of C1 (which is state 0).
This prevents the use of a bogus state -1 in the rest of the cpuidle
code.

Signed-off-by: default avatarJean Pihet <j-pihet@ti.com>
Signed-off-by: default avatarKevin Hilman <khilman@ti.com>
parent 34059a87

arch/arm/mach-omap2/cpuidle34xx.c

+1 −7
Original line number Diff line number Diff line
@@ -178,7 +178,7 @@ static int next_valid_state(struct cpuidle_device *dev, 
	u32 mpu_deepest_state = PWRDM_POWER_RET;

	u32 core_deepest_state = PWRDM_POWER_RET;

	int idx;

	int next_index = -1;

	int next_index = 0; /* C1 is the default value */



	if (enable_off_mode) {

		mpu_deepest_state = PWRDM_POWER_OFF;
@@ -209,12 +209,6 @@ static int next_valid_state(struct cpuidle_device *dev, 
		}

	}



	/*

	 * C1 is always valid.

	 * So, no need to check for 'next_index == -1' outside

	 * this loop.

	 */



	return next_index;

}