From: Yoshinori Sato <ysato@users.sourceforge.jp>
To: Daniel Lezcano <daniel.lezcano@linaro.org>,
Thomas Gleixner <tglx@linutronix.de>
Cc: Yoshinori Sato <ysato@users.sourceforge.jp>,
linux-kernel@vger.kernel.org
Subject: [PATCH v2 2/5] clocksource: h8300: Fix timer not overflow case
Date: Sat, 5 Dec 2015 02:48:15 +0900 [thread overview]
Message-ID: <1449251298-29933-3-git-send-email-ysato@users.sourceforge.jp> (raw)
In-Reply-To: <1449251298-29933-1-git-send-email-ysato@users.sourceforge.jp>
Signed-off-by: Yoshinori Sato <ysato@users.sourceforge.jp>
---
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;
}
--
2.6.1
next prev parent reply other threads:[~2015-12-04 17:48 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-12-04 5:56 [PATCH 0/5] clocksource: h8300: driver update Yoshinori Sato
2015-12-04 5:56 ` [PATCH 1/5] clocksource: h8300: Change to overflow interrupt Yoshinori Sato
2015-12-04 5:56 ` [PATCH 2/5] clocksource: h8300: Fix timer not overflow case Yoshinori Sato
2015-12-04 5:56 ` [PATCH 3/5] clocksource: h8300: Simplify delta handling Yoshinori Sato
2015-12-04 5:56 ` [PATCH 4/5] clocksource: h8300: Initializer cleanup Yoshinori Sato
2015-12-04 5:56 ` [PATCH 5/5] clocksource: h8300: Use ioread / iowrite Yoshinori Sato
2015-12-04 14:38 ` kbuild test robot
2015-12-04 17:48 ` [PATCH v2 0/5] h8300 clocksource update Yoshinori Sato
2015-12-04 17:48 ` [PATCH v2 1/5] clocksource: h8300: Change to overflow interrupt Yoshinori Sato
2015-12-04 17:48 ` Yoshinori Sato [this message]
2015-12-04 17:48 ` [PATCH v2 3/5] clocksource: h8300: Simplify delta handling Yoshinori Sato
2015-12-04 17:48 ` [PATCH v2 4/5] clocksource: h8300: Initializer cleanup Yoshinori Sato
2015-12-04 17:48 ` [PATCH v2 5/5] h8300: clocksource: Use ioread / iowrite Yoshinori Sato
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1449251298-29933-3-git-send-email-ysato@users.sourceforge.jp \
--to=ysato@users.sourceforge.jp \
--cc=daniel.lezcano@linaro.org \
--cc=linux-kernel@vger.kernel.org \
--cc=tglx@linutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox