Przeglądaj źródła

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>
Yoshinori Sato 9 lat temu
rodzic
commit
2f445e0aa0
1 zmienionych plików z 4 dodań i 2 usunięć
  1. 4 2
      drivers/clocksource/h8300_timer16.c

+ 4 - 2
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;
 }