From: Boris BREZILLON <b.brezillon@overkiz.com>
To: Wim Van Sebroeck <wim@iguana.be>
Cc: Fabio Porcedda <fabio.porcedda@gmail.com>,
Nicolas Ferre <nicolas.ferre@atmel.com>,
Guenter Roeck <groeck7@gmail.com>,
Yang Wenyou <wenyou.yang@atmel.com>,
linux-kernel@vger.kernel.org,
linux-arm-kernel@lists.infradead.org,
linux-watchdog@vger.kernel.org,
Boris BREZILLON <b.brezillon@overkiz.com>
Subject: [PATCH 1/3] watchdog: at91sam9_wdt: fix secs_to_ticks
Date: Sun, 3 Nov 2013 18:52:42 +0100 [thread overview]
Message-ID: <1383501164-8111-2-git-send-email-b.brezillon@overkiz.com> (raw)
In-Reply-To: <1383501164-8111-1-git-send-email-b.brezillon@overkiz.com>
Fix the secs_to_ticks macro in case 0 is passed as an argument.
Signed-off-by: Boris BREZILLON <b.brezillon@overkiz.com>
---
drivers/watchdog/at91sam9_wdt.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/watchdog/at91sam9_wdt.c b/drivers/watchdog/at91sam9_wdt.c
index 9bd089e..65f4691 100644
--- a/drivers/watchdog/at91sam9_wdt.c
+++ b/drivers/watchdog/at91sam9_wdt.c
@@ -51,7 +51,7 @@
#define ticks_to_hz_rounddown(t) ((((t) + 1) * HZ) >> 8)
#define ticks_to_hz_roundup(t) (((((t) + 1) * HZ) + 255) >> 8)
#define ticks_to_secs(t) (((t) + 1) >> 8)
-#define secs_to_ticks(s) (((s) << 8) - 1)
+#define secs_to_ticks(s) ((s) ? (((s) << 8) - 1) : 0)
#define WDT_MR_RESET 0x3FFF2FFF
--
1.7.9.5
next prev parent reply other threads:[~2013-11-03 17:52 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-11-03 17:52 [PATCH 0/3] watchdog: at91sam9_wdt: various fixes and improvements Boris BREZILLON
2013-11-03 17:52 ` Boris BREZILLON [this message]
2013-11-03 18:06 ` [PATCH 1/3] watchdog: at91sam9_wdt: fix secs_to_ticks Guenter Roeck
2013-11-03 17:52 ` [PATCH 2/3] watchdog: at91sam9_wdt: avoid spurious watchdog reset during init Boris BREZILLON
2013-11-03 18:09 ` Guenter Roeck
2013-11-03 17:52 ` [PATCH 3/3] watchdog: at91sam9_wdt: increase security margin on watchdog counter reset Boris BREZILLON
2013-11-03 18:32 ` Guenter Roeck
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=1383501164-8111-2-git-send-email-b.brezillon@overkiz.com \
--to=b.brezillon@overkiz.com \
--cc=fabio.porcedda@gmail.com \
--cc=groeck7@gmail.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-watchdog@vger.kernel.org \
--cc=nicolas.ferre@atmel.com \
--cc=wenyou.yang@atmel.com \
--cc=wim@iguana.be \
/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
all inboxes | Powered by JetHome®