Skip to content

Commit

Permalink
ARM: OMAP3: PM: cpuidle: default to C1 in next_valid_state
Browse files Browse the repository at this point in the history
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: Jean Pihet <j-pihet@ti.com>
Signed-off-by: Kevin Hilman <khilman@ti.com>
  • Loading branch information
Jean Pihet authored and Kevin Hilman committed Jun 25, 2012
1 parent 34059a8 commit 063a5d0
Showing 1 changed file with 1 addition and 7 deletions.
8 changes: 1 addition & 7 deletions arch/arm/mach-omap2/cpuidle34xx.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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;
}

Expand Down

0 comments on commit 063a5d0

Please sign in to comment.