Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=27c7742e7ae089377f984cde608ba02d1c544a97
Commit:     27c7742e7ae089377f984cde608ba02d1c544a97
Parent:     1c067318a2357fffc04e082429f276a8f4075561
Author:     Wim Van Sebroeck <[EMAIL PROTECTED]>
AuthorDate: Mon Jun 4 18:35:41 2007 +0000
Committer:  Wim Van Sebroeck <[EMAIL PROTECTED]>
CommitDate: Mon Jun 4 18:51:08 2007 +0000

    [WATCHDOG] Mixcom Watchdog - clean-up printk's
    
    Clean-up printk's.
    
    Signed-off-by: Wim Van Sebroeck <[EMAIL PROTECTED]>
---
 drivers/char/watchdog/mixcomwd.c |   12 +++++++++---
 1 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/drivers/char/watchdog/mixcomwd.c b/drivers/char/watchdog/mixcomwd.c
index e36c59c..59a3baa 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);
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to