From 49c267ac5b72fb554885cf936b1479686c84bd6d Mon Sep 17 00:00:00 2001 From: Barry Song Date: Mon, 30 Jul 2012 13:29:30 +0800 Subject: [PATCH] --- yaml --- r: 321247 b: refs/heads/master c: debeaf6c2ded82bea65c1a487fb629fb0d2bb66f h: refs/heads/master i: 321245: 9cedaa0f56d230b233648fd580090ddbcfd96bc6 321243: 875822b15f795a686eab01862bd4d466486bab92 321239: c18d7eb583c0df433d6dde36787bab82dad29385 321231: c501973bbf7030738ab74f26d63ea51bce8f8089 321215: 57bd669a415fb62c9d8983320eaaa100522b0c34 v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-prima2/timer.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 6cd283eecf6d..09b2739798f1 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 52c2ebd757d94f4a7215c3fc906646b24f44ecab +refs/heads/master: debeaf6c2ded82bea65c1a487fb629fb0d2bb66f diff --git a/trunk/arch/arm/mach-prima2/timer.c b/trunk/arch/arm/mach-prima2/timer.c index 0d024b1e916d..f224107de7bc 100644 --- a/trunk/arch/arm/mach-prima2/timer.c +++ b/trunk/arch/arm/mach-prima2/timer.c @@ -132,11 +132,11 @@ static void sirfsoc_clocksource_resume(struct clocksource *cs) { int i; - for (i = 0; i < SIRFSOC_TIMER_REG_CNT; i++) + for (i = 0; i < SIRFSOC_TIMER_REG_CNT - 2; i++) writel_relaxed(sirfsoc_timer_reg_val[i], sirfsoc_timer_base + sirfsoc_timer_reg_list[i]); - writel_relaxed(sirfsoc_timer_reg_val[i - 2], sirfsoc_timer_base + SIRFSOC_TIMER_COUNTER_LO); - writel_relaxed(sirfsoc_timer_reg_val[i - 1], sirfsoc_timer_base + SIRFSOC_TIMER_COUNTER_HI); + writel_relaxed(sirfsoc_timer_reg_val[SIRFSOC_TIMER_REG_CNT - 2], sirfsoc_timer_base + SIRFSOC_TIMER_COUNTER_LO); + writel_relaxed(sirfsoc_timer_reg_val[SIRFSOC_TIMER_REG_CNT - 1], sirfsoc_timer_base + SIRFSOC_TIMER_COUNTER_HI); } static struct clock_event_device sirfsoc_clockevent = {