[GIT PULL REQUEST] watchdog - v3.14-rc4 Fixes

[Wim Van Sebroeck]

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 <stanislav.kholmanskikh@xxxxxxxxxx>
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.
    
    Signed-off-by: Stanislav Kholmanskikh <stanislav.kholmanskikh@xxxxxxxxxx>
    Reviewed-by: Guenter Roeck <linux@xxxxxxxxxxxx>
    Signed-off-by: Wim Van Sebroeck <wim@xxxxxxxxx>

For completeness, I added the overal diff below.

Greetings,
Wim.

================================================================================
diff --git a/drivers/watchdog/w83697hf_wdt.c b/drivers/watchdog/w83697hf_wdt.c
index aaf2995..68b45fc 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;
 	}
 
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/