diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-01-19 01:06:19 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-01-19 01:06:19 +0300 |
| commit | c9daa2722a3f1967e3e9750fd4cb6a7352a3cd63 (patch) | |
| tree | a28c40b8e4f8ee1d653d5add903e03a9be0ede8a /drivers | |
| parent | 977c8fa4d75d4ebe7ebbe116eed9e06f780fb34d (diff) | |
| parent | 0d710cba3afde2109030254ee90654fbb580e8af (diff) | |
| download | linux-c9daa2722a3f1967e3e9750fd4cb6a7352a3cd63.tar.xz | |
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] clarify watchdog operation in documentation
[WATCHDOG] Revert "Stop looking for device as soon as one is found"
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/watchdog/w83697hf_wdt.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/watchdog/w83697hf_wdt.c b/drivers/watchdog/w83697hf_wdt.c index 6ea125eabeaa..c622a0e6c9ae 100644 --- a/drivers/watchdog/w83697hf_wdt.c +++ b/drivers/watchdog/w83697hf_wdt.c @@ -382,10 +382,8 @@ wdt_init(void) /* we will autodetect the W83697HF/HG watchdog */ for (i = 0; ((!found) && (w83697hf_ioports[i] != 0)); i++) { wdt_io = w83697hf_ioports[i]; - if (!w83697hf_check_wdt()) { + if (!w83697hf_check_wdt()) found++; - break; - } } } else { if (!w83697hf_check_wdt()) |