mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-08-27 03:10:12 +00:00
Code Issues Releases Wiki Activity

[WATCHDOG] bfin: fix max timeout calculation

Browse source 
Relying on overflow/wrap around isn't exact because if you wrap far
enough, you get back to "valid" values.

Reported-by: Thorsten Pohlmann <pohlmann@tetronik.com>
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
Cc: stable <stable@kernel.org>
This commit is contained in:
Mike Frysinger 2010-02-15 19:32:25 -05:00 committed by Wim Van Sebroeck
parent aea187c46f
commit 3dae93ec3e
1 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
drivers/watchdog/bfin_wdt.c
View file

@ -1,9 +1,8 @@
/* /*
* Blackfin On-Chip Watchdog Driver * Blackfin On-Chip Watchdog Driver
* Supports BF53[123]/BF53[467]/BF54[2489]/BF561
* *
* Originally based on softdog.c * Originally based on softdog.c
* Copyright 2006-2007 Analog Devices Inc. * Copyright 2006-2010 Analog Devices Inc.
* Copyright 2006-2007 Michele d'Amico * Copyright 2006-2007 Michele d'Amico
* Copyright 1996 Alan Cox <alan@lxorguk.ukuu.org.uk> * Copyright 1996 Alan Cox <alan@lxorguk.ukuu.org.uk>
* *
@ -137,13 +136,15 @@ static int bfin_wdt_running(void)
*/ */
static int bfin_wdt_set_timeout(unsigned long t) static int bfin_wdt_set_timeout(unsigned long t)
{ {
u32 cnt; u32 cnt, max_t, sclk;
unsigned long flags; unsigned long flags;
stampit(); sclk = get_sclk();
max_t = -1 / sclk;
cnt = t * sclk;
stamp("maxtimeout=%us newtimeout=%lus (cnt=%#x)", max_t, t, cnt);
cnt = t * get_sclk(); if (t > max_t) {
if (cnt < get_sclk()) {
printk(KERN_WARNING PFX "timeout value is too large\n"); printk(KERN_WARNING PFX "timeout value is too large\n");
return -EINVAL; return -EINVAL;
} }