diff options
| author | Matt Fleming <matt.fleming@intel.com> | 2014-03-05 21:22:57 +0400 |
|---|---|---|
| committer | Matt Fleming <matt.fleming@intel.com> | 2014-03-05 21:31:41 +0400 |
| commit | 4fd69331ad227a4d8de26592d017b73e00caca9f (patch) | |
| tree | bfd95ed518ff0cb44318715432d321a92a7b9a0c /drivers/watchdog/w83697hf_wdt.c | |
| parent | 69e608411473ac56358ef35277563982d0565381 (diff) | |
| parent | 0ac09f9f8cd1fb028a48330edba6023d347d3cea (diff) | |
| download | linux-4fd69331ad227a4d8de26592d017b73e00caca9f.tar.xz | |
Merge remote-tracking branch 'tip/x86/urgent' into efi-for-mingo
Conflicts:
arch/x86/include/asm/efi.h
Diffstat (limited to 'drivers/watchdog/w83697hf_wdt.c')
| -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; } |