From b6f5765d0baf2078deb6247911614fa87f89c3e2 Mon Sep 17 00:00:00 2001
From: Wim Van Sebroeck <wim@iguana.be>
Date: Sat, 27 Jan 2007 21:58:08 +0100
Subject: [PATCH] --- yaml --- r: 48147 b: refs/heads/master c:
 f6e4803969ee93bef6aeeb6aff0f9214547d1bb1 h: refs/heads/master i:   48145:
 2fff7b80ceb5ab0c4e957078d96e9b97dfdede41   48143:
 ddc3a19e742d450b7ea92a6b8166f40aad5b99b6 v: v3

---
 [refs]                                 |  2 +-
 trunk/drivers/char/watchdog/ib700wdt.c | 22 ++++++++++++++--------
 2 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/[refs] b/[refs]
index b31ae54aea92..2d0341cc113d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 35d55c943117864b9dff0253eb64672f048ac0f8
+refs/heads/master: f6e4803969ee93bef6aeeb6aff0f9214547d1bb1
diff --git a/trunk/drivers/char/watchdog/ib700wdt.c b/trunk/drivers/char/watchdog/ib700wdt.c
index 5510db21090a..d379bf075264 100644
--- a/trunk/drivers/char/watchdog/ib700wdt.c
+++ b/trunk/drivers/char/watchdog/ib700wdt.c
@@ -300,6 +300,10 @@ static struct notifier_block ibwdt_notifier = {
 	.notifier_call = ibwdt_notify_sys,
 };
 
+/*
+ *	Init & exit routines
+ */
+
 static int __init ibwdt_init(void)
 {
 	int res;
@@ -307,11 +311,6 @@ static int __init ibwdt_init(void)
 	printk(KERN_INFO PFX "WDT driver for IB700 single board computer initialising.\n");
 
 	spin_lock_init(&ibwdt_lock);
-	res = misc_register(&ibwdt_miscdev);
-	if (res) {
-		printk (KERN_ERR PFX "failed to register misc device\n");
-		goto out_nomisc;
-	}
 
 #if WDT_START != WDT_STOP
 	if (!request_region(WDT_STOP, 1, "IB700 WDT")) {
@@ -326,13 +325,22 @@ static int __init ibwdt_init(void)
 		res = -EIO;
 		goto out_nostartreg;
 	}
+
 	res = register_reboot_notifier(&ibwdt_notifier);
 	if (res) {
 		printk (KERN_ERR PFX "Failed to register reboot notifier.\n");
 		goto out_noreboot;
 	}
+
+	res = misc_register(&ibwdt_miscdev);
+	if (res) {
+		printk (KERN_ERR PFX "failed to register misc device\n");
+		goto out_nomisc;
+	}
 	return 0;
 
+out_nomisc:
+	unregister_reboot_notifier(&ibwdt_notifier);
 out_noreboot:
 	release_region(WDT_START, 1);
 out_nostartreg:
@@ -340,8 +348,6 @@ static int __init ibwdt_init(void)
 	release_region(WDT_STOP, 1);
 #endif
 out_nostopreg:
-	misc_deregister(&ibwdt_miscdev);
-out_nomisc:
 	return res;
 }
 
@@ -350,10 +356,10 @@ ibwdt_exit(void)
 {
 	misc_deregister(&ibwdt_miscdev);
 	unregister_reboot_notifier(&ibwdt_notifier);
+	release_region(WDT_START,1);
 #if WDT_START != WDT_STOP
 	release_region(WDT_STOP,1);
 #endif
-	release_region(WDT_START,1);
 }
 
 module_init(ibwdt_init);