diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2014-02-21 14:34:26 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-02-21 14:34:26 -0800 |
| commit | 0a4e836a60c786a46bc5691c2aaf30da0a317651 (patch) | |
| tree | 99d1bea2100f8ae2f23e9c54d1900c1e647abdb4 | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc (diff) | |
| parent | watchdog: w83697hf_wdt: return ENODEV if no device was found (diff) | |
| download | linux-dev-0a4e836a60c786a46bc5691c2aaf30da0a317651.tar.xz linux-dev-0a4e836a60c786a46bc5691c2aaf30da0a317651.zip | |
Merge git://www.linux-watchdog.org/linux-watchdog
Pull watchdog fix from Wim Van Sebroeck:
"It corrects the error code when no device was found for w83697hf_wdt"
* git://www.linux-watchdog.org/linux-watchdog:
watchdog: w83697hf_wdt: return ENODEV if no device was found
| -rw-r--r-- | drivers/watchdog/w83697hf_wdt.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/watchdog/w83697hf_wdt.c b/drivers/watchdog/w83697hf_wdt.c index aaf2995d37f4..68b45fc9ba6a 100644 --- a/drivers/watchdog/w83697hf_wdt.c +++ b/drivers/watchdog/w83697hf_wdt.c @@ -402,7 +402,7 @@ static int __init wdt_init(void) if (!found) { pr_err("No W83697HF/HG could be found\n"); - ret = -EIO; + ret = -ENODEV; goto out; } |