diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2012-02-27 16:17:50 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2012-02-27 16:17:50 +0100 |
| commit | 003e6348630aa16982c956beaf7cd0b53a3b609a (patch) | |
| tree | a61ce11b6120ab51a745f37db30cb1b242e80e4d /arch/arm/mach-omap2/cpuidle44xx.c | |
| parent | Merge branch 'fixes' of git://github.com/hzhuang1/linux into fixes (diff) | |
| parent | ARM: OMAP2: fix mailbox init code (diff) | |
| download | linux-003e6348630aa16982c956beaf7cd0b53a3b609a.tar.xz linux-003e6348630aa16982c956beaf7cd0b53a3b609a.zip | |
Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into fixes
Diffstat (limited to 'arch/arm/mach-omap2/cpuidle44xx.c')
| -rw-r--r-- | arch/arm/mach-omap2/cpuidle44xx.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/arch/arm/mach-omap2/cpuidle44xx.c b/arch/arm/mach-omap2/cpuidle44xx.c index cfdbb86bc84e..72e018b9b260 100644 --- a/arch/arm/mach-omap2/cpuidle44xx.c +++ b/arch/arm/mach-omap2/cpuidle44xx.c @@ -65,7 +65,6 @@ static int omap4_enter_idle(struct cpuidle_device *dev, struct timespec ts_preidle, ts_postidle, ts_idle; u32 cpu1_state; int idle_time; - int new_state_idx; int cpu_id = smp_processor_id(); /* Used to keep track of the total time in idle */ @@ -84,8 +83,8 @@ static int omap4_enter_idle(struct cpuidle_device *dev, */ cpu1_state = pwrdm_read_pwrst(cpu1_pd); if (cpu1_state != PWRDM_POWER_OFF) { - new_state_idx = drv->safe_state_index; - cx = cpuidle_get_statedata(&dev->states_usage[new_state_idx]); + index = drv->safe_state_index; + cx = cpuidle_get_statedata(&dev->states_usage[index]); } if (index > 0) |