wingel@nano-system.com

wingel@nano-system.com

[Christer Weinigel]

[-- Attachment #1: Type: text/plain, Size: 188 bytes --]

Hi,

Chris Wilson found and fixed a few bugs in the failure paths of the
scx200_wdt driver that I'm the maintainer for.  Could you please apply
this patch that fixes these.

  /Christer 


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: scx200_wdt.patch --]
[-- Type: text/x-patch, Size: 793 bytes --]

--- linux-2.5.47/drivers/char/scx200_wdt.c	Mon Nov 11 03:28:26 2002
+++ linux-2.5.47-chris/drivers/char/scx200_wdt.c	Sun Nov 17 19:27:32 2002
@@ -240,23 +240,28 @@
 	}
 
 	scx200_wdt_update_margin();
 	scx200_wdt_disable();
 
 	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;
         }
 
 	return 0;
 }
 
 static void __exit scx200_wdt_cleanup(void)
 {

[-- Attachment #3: Type: text/plain, Size: 205 bytes --]


-- 
"Just how much can I get away with and still go to heaven?"

Freelance consultant specializing in device driver programming for Linux 
Christer Weinigel <christer@weinigel.se>  http://www.weinigel.se