Skip to content

Commit

Permalink
Merge git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-wat…
Browse files Browse the repository at this point in the history
…chdog

* git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog:
  [WATCHDOG] ib700wdt.c - fix buffer_underflow bug
  • Loading branch information
Linus Torvalds committed Oct 20, 2008
2 parents 1d9a8a4 + 7c2500f commit d67ae20
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion drivers/watchdog/ib700wdt.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit d67ae20

Please sign in to comment.