Commit d13536be authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 87b8d1ad 3dae93ec

drivers/watchdog/bfin_wdt.c

+7 −6
Original line number Diff line number Diff line 
/*

 * 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;

	}