[Uclinux-h8-devel] [PATCH 66/69] clocksource/drivers/h8300: Fix timer not overflow case

Zurück zum Archiv-Index

Daniel Lezcano danie****@linar*****
2015年 12月 18日 (金) 23:18:19 JST


From: Yoshinori Sato <ysato****@users*****>

Signed-off-by: Yoshinori Sato <ysato****@users*****>
Signed-off-by: Daniel Lezcano <danie****@linar*****>
---
 drivers/clocksource/h8300_timer16.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/drivers/clocksource/h8300_timer16.c b/drivers/clocksource/h8300_timer16.c
index b14a8da..934ed0b 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;
 }
 
 
-- 
1.9.1




Uclinux-h8-devel メーリングリストの案内
Zurück zum Archiv-Index