summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2014-02-21 23:34:26 +0100
committerLinus Torvalds <torvalds@linux-foundation.org>2014-02-21 23:34:26 +0100
commit0a4e836a60c786a46bc5691c2aaf30da0a317651 (patch)
tree99d1bea2100f8ae2f23e9c54d1900c1e647abdb4 /drivers
parentMerge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc (diff)
parentwatchdog: w83697hf_wdt: return ENODEV if no device was found (diff)
downloadlinux-0a4e836a60c786a46bc5691c2aaf30da0a317651.tar.xz
linux-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
Diffstat (limited to 'drivers')
-rw-r--r--drivers/watchdog/w83697hf_wdt.c2
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;
}