[PATCH 2/5] clocksource: h8300: Fix timer not overflow case

[Yoshinori Sato]

Signed-off-by: Yoshinori Sato 
---
 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 |= 0x1;
-   return v2;
+   if (likely(!o1))
+   return v2;
+   else
+   return v2 + 0x1;
 }
 
 
-- 
2.6.1

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

[PATCH 2/5] clocksource: h8300: Fix timer not overflow case

[Yoshinori Sato]

Signed-off-by: Yoshinori Sato 
---
 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 |= 0x1;
-   return v2;
+   if (likely(!o1))
+   return v2;
+   else
+   return v2 + 0x1;
 }
 
 
-- 
2.6.1

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