summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorWim Van Sebroeck <wim@iguana.be>2007-06-04 18:35:41 +0000
committerWim Van Sebroeck <wim@iguana.be>2007-06-04 18:51:08 +0000
commit27c7742e7ae089377f984cde608ba02d1c544a97 (patch)
tree54a682f27bd5e2ba2894e6adb7f5401ba29cdff5 /drivers
parent1c067318a2357fffc04e082429f276a8f4075561 (diff)
downloadlinux-stable-27c7742e7ae089377f984cde608ba02d1c544a97.tar.gz
linux-stable-27c7742e7ae089377f984cde608ba02d1c544a97.tar.bz2
linux-stable-27c7742e7ae089377f984cde608ba02d1c544a97.zip
[WATCHDOG] Mixcom Watchdog - clean-up printk's
Clean-up printk's. Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/char/watchdog/mixcomwd.c12
1 files changed, 9 insertions, 3 deletions
diff --git a/drivers/char/watchdog/mixcomwd.c b/drivers/char/watchdog/mixcomwd.c
index e36c59c5d6c3..59a3baadc704 100644
--- a/drivers/char/watchdog/mixcomwd.c
+++ b/drivers/char/watchdog/mixcomwd.c
@@ -287,13 +287,19 @@ static int __init mixcomwd_init(void)
ret = misc_register(&mixcomwd_miscdev);
if (ret)
{
- release_region(watchdog_port, 1);
- return ret;
+ printk(KERN_ERR PFX "cannot register miscdev on minor=%d (err=%d)\n",
+ WATCHDOG_MINOR, ret);
+ goto error_misc_register_watchdog;
}
printk(KERN_INFO "MixCOM watchdog driver v%s, watchdog port at 0x%3x\n",VERSION,watchdog_port);
return 0;
+
+error_misc_register_watchdog:
+ release_region(watchdog_port, 1);
+ watchdog_port = 0x0000;
+ return ret;
}
static void __exit mixcomwd_exit(void)
@@ -306,8 +312,8 @@ static void __exit mixcomwd_exit(void)
mixcomwd_timer_alive=0;
}
}
- release_region(watchdog_port,1);
misc_deregister(&mixcomwd_miscdev);
+ release_region(watchdog_port,1);
}
module_init(mixcomwd_init);