diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-02-21 11:25:47 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-02-21 11:25:47 -0800 |
| commit | d13536bef4b42d3e24f5ae2429722d008c60e3fc (patch) | |
| tree | 07f45a2e4b178a4340e63dab6f04600cb1f27fa4 | |
| parent | 87b8d1adefa1548b591cbf0d63965987e2cf893d (diff) | |
| parent | 3dae93ec3ee1fceec69f40ef9b97892ce62ba7a5 (diff) | |
| download | linux-d13536bef4b42d3e24f5ae2429722d008c60e3fc.tar.gz linux-d13536bef4b42d3e24f5ae2429722d008c60e3fc.tar.bz2 linux-d13536bef4b42d3e24f5ae2429722d008c60e3fc.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog
* git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog:
[WATCHDOG] bfin: fix max timeout calculation
| -rw-r--r-- | drivers/watchdog/bfin_wdt.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/drivers/watchdog/bfin_wdt.c b/drivers/watchdog/bfin_wdt.c index c7b3f9df2317..2159e668751c 100644 --- a/drivers/watchdog/bfin_wdt.c +++ b/drivers/watchdog/bfin_wdt.c @@ -1,9 +1,8 @@ /* * Blackfin On-Chip Watchdog Driver - * Supports BF53[123]/BF53[467]/BF54[2489]/BF561 * * Originally based on softdog.c - * Copyright 2006-2007 Analog Devices Inc. + * Copyright 2006-2010 Analog Devices Inc. * Copyright 2006-2007 Michele d'Amico * 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) { - u32 cnt; + u32 cnt, max_t, sclk; 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 (cnt < get_sclk()) { + if (t > max_t) { printk(KERN_WARNING PFX "timeout value is too large\n"); return -EINVAL; } |