Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1267232

[PATCH 2/4] h8300: clocksource: Counter overflow fix

Show all headers | View raw

Signed-off-by: Yoshinori Sato <ysato@users.sourceforge.jp>
---
 drivers/clocksource/h8300_timer16.c | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/drivers/clocksource/h8300_timer16.c b/drivers/clocksource/h8300_timer16.c
index 53daf6a..639acf3 100644
--- a/drivers/clocksource/h8300_timer16.c
+++ b/drivers/clocksource/h8300_timer16.c
@@ -32,8 +32,8 @@ struct timer16_priv {
 
 static unsigned long timer16_get_counter(struct timer16_priv *p)
 {
-	unsigned long v1, v2, v3;
-	int o1, o2;
+	unsigned short v1, v2, v3;
+	unsigned char o1, o2;
 
 	o1 = ctrl_inb(p->mapcommon + TISRC) & p->ovf;
 
@@ -47,8 +47,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 (unlikely(!o1))
+		return v2;
+	else
+		return v2 + 0x10000;
 }
 
 
-- 
2.6.1

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH 01/15] clocksource/drivers/h8300_timer8: Fix compilation error with dev_warn Daniel Lezcano <daniel.lezcano@linaro.org> - 2015-11-09 11:10 +0100
  [PATCH 05/15] clocksource/drivers/h8300_timer8: Remove unused macros Daniel Lezcano <daniel.lezcano@linaro.org> - 2015-11-09 11:20 +0100
  Re: [PATCH 01/15] clocksource/drivers/h8300_timer8: Fix compilation  error with dev_warn Daniel Lezcano <daniel.lezcano@linaro.org> - 2015-11-09 11:20 +0100
  [PATCH 03/15] clocksource/drivers/h8300_tpu: Remove pointless headers for TPU Daniel Lezcano <daniel.lezcano@linaro.org> - 2015-11-09 11:20 +0100
    Re: [PATCH 03/15] clocksource/drivers/h8300_tpu: Remove pointless headers for TPU Yoshinori Sato <ysato@users.sourceforge.jp> - 2015-11-11 16:00 +0100
  [PATCH 10/15] clocksource/drivers/h8300_timer8: Retrieve the clock rate at init time Daniel Lezcano <daniel.lezcano@linaro.org> - 2015-11-09 11:20 +0100
  [PATCH 04/15] clocksource/drivers/h8300_timer8: Remove unused headers Daniel Lezcano <daniel.lezcano@linaro.org> - 2015-11-09 11:20 +0100
  [PATCH 3/4] h8300: clocksource: More simplify timer8_set_next Yoshinori Sato <ysato@users.sourceforge.jp> - 2015-11-11 16:00 +0100
  [PATCH 2/4] h8300: clocksource: Counter overflow fix Yoshinori Sato <ysato@users.sourceforge.jp> - 2015-11-11 16:00 +0100
  [PATCH 4/4] h8300: clocksource: remove unused local-variable. Yoshinori Sato <ysato@users.sourceforge.jp> - 2015-11-11 16:00 +0100
  [PATCH 0/4] h8300: clock driver update Yoshinori Sato <ysato@users.sourceforge.jp> - 2015-11-11 16:00 +0100
    [PATCH 1/4] h8300: clocksource: Use overflow interrupt Yoshinori Sato <ysato@users.sourceforge.jp> - 2015-11-11 16:00 +0100
      Re: [PATCH 1/4] h8300: clocksource: Use overflow interrupt Daniel Lezcano <daniel.lezcano@linaro.org> - 2015-11-12 18:00 +0100
    Re: [PATCH 0/4] h8300: clock driver update Daniel Lezcano <daniel.lezcano@linaro.org> - 2015-11-12 17:30 +0100

csiph-web