From 7a8a06dea02678b382d96e380af0d75d57d7663c Mon Sep 17 00:00:00 2001
From: Shawn Guo <shawn.guo@linaro.org>
Date: Thu, 6 Dec 2012 22:54:41 +0800
Subject: [PATCH] --- yaml --- r: 355525 b: refs/heads/master c:
 eea8e326ff476e418b99b6daa97f9bd85ac6c523 h: refs/heads/master i:   355523:
 42a1a7d6536a0fdec1f8629780740352144f0e65 v: v3

---
 [refs]                         | 2 +-
 trunk/arch/arm/mach-imx/time.c | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 416a9a81c011..5a2d3f143a03 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1d7180e24e22a608cc4d7e8fd425a19a9394a7ed
+refs/heads/master: eea8e326ff476e418b99b6daa97f9bd85ac6c523
diff --git a/trunk/arch/arm/mach-imx/time.c b/trunk/arch/arm/mach-imx/time.c
index f017302f6d09..5d7eb482efd3 100644
--- a/trunk/arch/arm/mach-imx/time.c
+++ b/trunk/arch/arm/mach-imx/time.c
@@ -152,7 +152,8 @@ static int v2_set_next_event(unsigned long evt,
 
 	__raw_writel(tcmp, timer_base + V2_TCMP);
 
-	return (int)(tcmp - __raw_readl(timer_base + V2_TCN)) < 0 ?
+	return evt < 0x7fffffff &&
+		(int)(tcmp - __raw_readl(timer_base + V2_TCN)) < 0 ?
 				-ETIME : 0;
 }