]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
watchdog: Fix warning
authorAlan Cox <alan@redhat.com>
Tue, 21 Oct 2008 12:44:58 +0000 (13:44 +0100)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 23 Oct 2008 16:19:47 +0000 (09:19 -0700)
This seems to have popped up after the recent merges:

drivers/watchdog/w83697ug_wdt.c: In function ‘w83697ug_select_wd_register’:
drivers/watchdog/w83697ug_wdt.c:105: warning: ‘return’ with a value, in function returning void

Signed-off-by: Alan Cox <alan@redhat.com>
Acked-by: Wim Van Sebroeck <wim@iguana.be>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
drivers/watchdog/w83697ug_wdt.c

index c73b5e2919c6abfddfc11e7290e121ee4d6765b7..ada8ad82d993a43b0e5e928148a9bd65919e536a 100644 (file)
@@ -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 */