diff --git a/[refs] b/[refs] index fd5590874ae7..06ceefec79bd 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a8ddac7e53e89cb877965097d05adfeb1c91def3 +refs/heads/master: 7dc9b48fc5b9641d4b2a222825e5be64ebb27356 diff --git a/trunk/drivers/watchdog/w83697ug_wdt.c b/trunk/drivers/watchdog/w83697ug_wdt.c index c73b5e2919c6..ada8ad82d993 100644 --- a/trunk/drivers/watchdog/w83697ug_wdt.c +++ b/trunk/drivers/watchdog/w83697ug_wdt.c @@ -102,7 +102,7 @@ static void w83697ug_select_wd_register(void) } else { printk(KERN_ERR PFX "No W83697UG/UF could be found\n"); - return -EIO; + return; } outb_p(0x07, WDT_EFER); /* point to logical device number reg */