Skip to contentSkip to conversation

watchdog - v3.14-rc4 Fixes

GIT PULL Wim Van Sebroeck 1 participant 1 message Feb 21, 2014 Watchdog device drivers

lore
Share & tools
lore
#0 lore raw

Hi Linus,

Please pull from 'master' branch of
git://www.linux-watchdog.org/linux-watchdog.git

It corrects the error code when no device was found for w83697hf_wdt.

This will update the following files:

 w83697hf_wdt.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

with these Changes:

commit 0cb1c3e853e0d0f996f4e11863407bf31e6b7343

Author: Stanislav Kholmanskikh <[email protected]>
Date:   Mon Jan 27 11:04:33 2014 +0400

watchdog: w83697hf_wdt: return ENODEV if no device was found

Most WDT driver modules return ENODEV during modprobe if no valid device was found, but w83697hf_wdt returns EIO.

Let w83697hf_wdt return ENODEV.

For completeness, I added the overal diff below.

Greetings,
Wim.

================================================================================

drivers/watchdog/w83697hf_wdt.c +1 -1
index aaf2995..68b45fc 100644
@@ -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;
 	}