From: Yoshinori Sato <ysato@users.sourceforge.jp>
Date: Fri, 4 Dec 2015 17:48:15 +0000 (+0900)
Subject: clocksource/drivers/h8300: Fix timer not overflow case
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=2f445e0aa00e3bdbcf6e99b88a6aab54b6b02f2a;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git

clocksource/drivers/h8300: Fix timer not overflow case

Signed-off-by: Yoshinori Sato <ysato@users.sourceforge.jp>
Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>
---

diff --git a/drivers/clocksource/h8300_timer16.c b/drivers/clocksource/h8300_timer16.c
index b14a8da90ecc..934ed0bceec5 100644
--- a/drivers/clocksource/h8300_timer16.c
+++ b/drivers/clocksource/h8300_timer16.c
@@ -48,8 +48,10 @@ static unsigned long timer16_get_counter(struct timer16_priv *p)
 	} while (unlikely((o1 != o2) || (v1 > v2 && v1 < v3)
 			  || (v2 > v3 && v2 < v1) || (v3 > v1 && v3 < v2)));
 
-	v2 |= 0x10000;
-	return v2;
+	if (likely(!o1))
+		return v2;
+	else
+		return v2 + 0x10000;
 }