[PATCH] fixups for error path on sc1200 wdog

37ab5e1c · Alan Cox · Linus Torvalds · 32f05867 · 37ab5e1c
Commit 37ab5e1c authored Nov 25, 2002 by Alan Cox Committed by Linus Torvalds Nov 25, 2002
Show whitespace changes
Inline Side-by-side

Showing with 6 additions and 1 deletion

drivers/char/watchdog/scx200_wdt.c drivers/char/watchdog/scx200_wdt.c +6 -1

No files found.
--- a/drivers/char/watchdog/scx200_wdt.c
+++ b/drivers/char/watchdog/scx200_wdt.c
@@ -245,13 +245,18 @@ static int __init scx200_wdt_init(void)
 	sema_init(&open_semaphore, 1);
 	r = misc_register(&scx200_wdt_miscdev);
-	if (r)
+	if (r) {
+		release_region(SCx200_CB_BASE + SCx200_WDT_OFFSET,
+				SCx200_WDT_SIZE);
 		return r;
+	}
 	r = register_reboot_notifier(&scx200_wdt_notifier);
        if (r) {
                printk(KERN_ERR NAME ": unable to register reboot notifier");
 		misc_deregister(&scx200_wdt_miscdev);
+		release_region(SCx200_CB_BASE + SCx200_WDT_OFFSET,
+				SCx200_WDT_SIZE);
                return r;
        }