diff options
Diffstat (limited to 'arch/arm/plat-omap/dmtimer.c')
-rw-r--r-- | arch/arm/plat-omap/dmtimer.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/arch/arm/plat-omap/dmtimer.c b/arch/arm/plat-omap/dmtimer.c index 320d10381715..f0a3c4c72a42 100644 --- a/arch/arm/plat-omap/dmtimer.c +++ b/arch/arm/plat-omap/dmtimer.c | |||
@@ -83,7 +83,6 @@ static void omap_dm_timer_write_reg(struct omap_dm_timer *timer, u32 reg, | |||
83 | 83 | ||
84 | static void omap_timer_restore_context(struct omap_dm_timer *timer) | 84 | static void omap_timer_restore_context(struct omap_dm_timer *timer) |
85 | { | 85 | { |
86 | __raw_writel(timer->context.tisr, timer->irq_stat); | ||
87 | omap_dm_timer_write_reg(timer, OMAP_TIMER_WAKEUP_EN_REG, | 86 | omap_dm_timer_write_reg(timer, OMAP_TIMER_WAKEUP_EN_REG, |
88 | timer->context.twer); | 87 | timer->context.twer); |
89 | omap_dm_timer_write_reg(timer, OMAP_TIMER_COUNTER_REG, | 88 | omap_dm_timer_write_reg(timer, OMAP_TIMER_COUNTER_REG, |
@@ -440,7 +439,6 @@ int omap_dm_timer_stop(struct omap_dm_timer *timer) | |||
440 | */ | 439 | */ |
441 | timer->context.tclr = | 440 | timer->context.tclr = |
442 | omap_dm_timer_read_reg(timer, OMAP_TIMER_CTRL_REG); | 441 | omap_dm_timer_read_reg(timer, OMAP_TIMER_CTRL_REG); |
443 | timer->context.tisr = __raw_readl(timer->irq_stat); | ||
444 | omap_dm_timer_disable(timer); | 442 | omap_dm_timer_disable(timer); |
445 | return 0; | 443 | return 0; |
446 | } | 444 | } |
@@ -684,8 +682,7 @@ int omap_dm_timer_write_status(struct omap_dm_timer *timer, unsigned int value) | |||
684 | return -EINVAL; | 682 | return -EINVAL; |
685 | 683 | ||
686 | __omap_dm_timer_write_status(timer, value); | 684 | __omap_dm_timer_write_status(timer, value); |
687 | /* Save the context */ | 685 | |
688 | timer->context.tisr = value; | ||
689 | return 0; | 686 | return 0; |
690 | } | 687 | } |
691 | EXPORT_SYMBOL_GPL(omap_dm_timer_write_status); | 688 | EXPORT_SYMBOL_GPL(omap_dm_timer_write_status); |