From 834f7185367f7ec90de1f4ce78b1de5de1e9664f Mon Sep 17 00:00:00 2001 From: Jon Hunter Date: Thu, 4 Oct 2012 18:17:42 -0500 Subject: [PATCH] --- yaml --- r: 339928 b: refs/heads/master c: 991ad16a927c721b301f27aa9b61a13a24b54dda h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/arm/plat-omap/dmtimer.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index d8f0916413c5..33f35436b1b0 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1eaff71017d97ce2bc8e22b9a5cf11e5c6dd6c78 +refs/heads/master: 991ad16a927c721b301f27aa9b61a13a24b54dda diff --git a/trunk/arch/arm/plat-omap/dmtimer.c b/trunk/arch/arm/plat-omap/dmtimer.c index f0a3c4c72a42..a38e8964c820 100644 --- a/trunk/arch/arm/plat-omap/dmtimer.c +++ b/trunk/arch/arm/plat-omap/dmtimer.c @@ -584,8 +584,8 @@ int omap_dm_timer_set_match(struct omap_dm_timer *timer, int enable, l |= OMAP_TIMER_CTRL_CE; else l &= ~OMAP_TIMER_CTRL_CE; - omap_dm_timer_write_reg(timer, OMAP_TIMER_CTRL_REG, l); omap_dm_timer_write_reg(timer, OMAP_TIMER_MATCH_REG, match); + omap_dm_timer_write_reg(timer, OMAP_TIMER_CTRL_REG, l); /* Save the context */ timer->context.tclr = l;