From c10da1bbef7e1ca07f7772e9ca3b502d0d2a83d7 Mon Sep 17 00:00:00 2001
From: Wim Van Sebroeck <wim@iguana.be>
Date: Sun, 30 Jul 2006 20:06:07 +0200
Subject: [PATCH] --- yaml --- r: 37979 b: refs/heads/master c:
 f676449785d333078acb60ccf2046d0d3c59548f h: refs/heads/master i:   37977:
 eafa185af761ce0e527444b5d36953c715bb2af5   37975:
 08211a6541192dd099feee56940f392125972c65 v: v3

---
 [refs]                                    |  2 +-
 trunk/drivers/char/watchdog/pnx4008_wdt.c | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index 22852e36bb9c..7b8ef87d043f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2898172708aa84c9b0ce3865d6ff1ef76b538f51
+refs/heads/master: f676449785d333078acb60ccf2046d0d3c59548f
diff --git a/trunk/drivers/char/watchdog/pnx4008_wdt.c b/trunk/drivers/char/watchdog/pnx4008_wdt.c
index d36a169c1b86..465dfd3ba61a 100644
--- a/trunk/drivers/char/watchdog/pnx4008_wdt.c
+++ b/trunk/drivers/char/watchdog/pnx4008_wdt.c
@@ -297,17 +297,17 @@ static int pnx4008_wdt_probe(struct platform_device *pdev)
 
 static int pnx4008_wdt_remove(struct platform_device *pdev)
 {
-	if (wdt_mem) {
-		release_resource(wdt_mem);
-		kfree(wdt_mem);
-		wdt_mem = NULL;
-	}
+	misc_deregister(&pnx4008_wdt_miscdev);
 	if (wdt_clk) {
 		clk_set_rate(wdt_clk, 0);
 		clk_put(wdt_clk);
 		wdt_clk = NULL;
 	}
-	misc_deregister(&pnx4008_wdt_miscdev);
+	if (wdt_mem) {
+		release_resource(wdt_mem);
+		kfree(wdt_mem);
+		wdt_mem = NULL;
+	}
 	return 0;
 }