From c6466caeaf3aa80c35f90ce0c051a0529f2c168d Mon Sep 17 00:00:00 2001 From: Jon Hunter Date: Fri, 6 Jul 2012 16:46:35 -0500 Subject: [PATCH] --- yaml --- r: 339925 b: refs/heads/master c: ffc957bd83b623fa6ead068bf1a444decce2cc00 h: refs/heads/master i: 339923: 0cb38af01e6276a60b194961b9626d9ff20fa027 v: v3 --- [refs] | 2 +- trunk/arch/arm/plat-omap/dmtimer.c | 7 ++----- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index a0f3fcda77d9..d77b60a8e5f0 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 10759e823c83e6c88b58264daa791bb82c7ebad9 +refs/heads/master: ffc957bd83b623fa6ead068bf1a444decce2cc00 diff --git a/trunk/arch/arm/plat-omap/dmtimer.c b/trunk/arch/arm/plat-omap/dmtimer.c index 10ec31b8a3a2..d4f95410539f 100644 --- a/trunk/arch/arm/plat-omap/dmtimer.c +++ b/trunk/arch/arm/plat-omap/dmtimer.c @@ -121,11 +121,8 @@ static void omap_dm_timer_wait_for_reset(struct omap_dm_timer *timer) static void omap_dm_timer_reset(struct omap_dm_timer *timer) { - if (timer->pdev->id != 1) { - omap_dm_timer_write_reg(timer, OMAP_TIMER_IF_CTRL_REG, 0x06); - omap_dm_timer_wait_for_reset(timer); - } - + omap_dm_timer_write_reg(timer, OMAP_TIMER_IF_CTRL_REG, 0x06); + omap_dm_timer_wait_for_reset(timer); __omap_dm_timer_reset(timer, 0, 0); }