aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2008-10-20 12:53:40 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2008-10-20 12:53:40 -0700
commitd67ae206ef05198824c2a306c0c0edf2d2088920 (patch)
tree66696bd66378e76483d15375b49e9a14aa5c1610
parent1d9a8a47d659f053abeca9ece45651b4d94780c8 (diff)
parent7c2500f17d65092d93345f3996cf82ebca17e9ff (diff)
downloadlinux-linaro-stable-d67ae206ef05198824c2a306c0c0edf2d2088920.tar.gz
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] ib700wdt.c - fix buffer_underflow bug
-rw-r--r--drivers/watchdog/ib700wdt.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/watchdog/ib700wdt.c b/drivers/watchdog/ib700wdt.c
index 05a28106e8eb..8782ec1f5aa0 100644
--- a/drivers/watchdog/ib700wdt.c
+++ b/drivers/watchdog/ib700wdt.c
@@ -154,7 +154,7 @@ static int ibwdt_set_heartbeat(int t)
return -EINVAL;
for (i = 0x0F; i > -1; i--)
- if (wd_times[i] > t)
+ if (wd_times[i] >= t)
break;
wd_margin = i;
return 0;