diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-20 15:53:40 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-20 15:53:40 -0400 |
| commit | d67ae206ef05198824c2a306c0c0edf2d2088920 (patch) | |
| tree | 66696bd66378e76483d15375b49e9a14aa5c1610 /drivers | |
| parent | 1d9a8a47d659f053abeca9ece45651b4d94780c8 (diff) | |
| parent | 7c2500f17d65092d93345f3996cf82ebca17e9ff (diff) | |
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
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/watchdog/ib700wdt.c | 2 |
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) | |||
| 154 | return -EINVAL; | 154 | return -EINVAL; |
| 155 | 155 | ||
| 156 | for (i = 0x0F; i > -1; i--) | 156 | for (i = 0x0F; i > -1; i--) |
| 157 | if (wd_times[i] > t) | 157 | if (wd_times[i] >= t) |
| 158 | break; | 158 | break; |
| 159 | wd_margin = i; | 159 | wd_margin = i; |
| 160 | return 0; | 160 | return 0; |