From f29933d8fb8d59a3dfb3b5873df85f2cd39fd24c Mon Sep 17 00:00:00 2001
From: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
Date: Mon, 10 Sep 2012 12:41:15 +0800
Subject: [PATCH] --- yaml --- r: 323021 b: refs/heads/master c:
 b232a70a1735c004f9ee6fdf363def527b9234b6 h: refs/heads/master i:   323019:
 82c9e8bb0dd4611daa2700e18d5131f5b738dd77 v: v3

---
 [refs]                                 | 2 +-
 trunk/drivers/watchdog/watchdog_core.c | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index d0bb8f9648d2..235448765534 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 308b135e4fcc00c80c07e0e04e7afa8edf78583c
+refs/heads/master: b232a70a1735c004f9ee6fdf363def527b9234b6
diff --git a/trunk/drivers/watchdog/watchdog_core.c b/trunk/drivers/watchdog/watchdog_core.c
index 6aa46a90ff02..3796434991fa 100644
--- a/trunk/drivers/watchdog/watchdog_core.c
+++ b/trunk/drivers/watchdog/watchdog_core.c
@@ -128,11 +128,12 @@ EXPORT_SYMBOL_GPL(watchdog_register_device);
 void watchdog_unregister_device(struct watchdog_device *wdd)
 {
 	int ret;
-	int devno = wdd->cdev.dev;
+	int devno;
 
 	if (wdd == NULL)
 		return;
 
+	devno = wdd->cdev.dev;
 	ret = watchdog_dev_unregister(wdd);
 	if (ret)
 		pr_err("error unregistering /dev/watchdog (err=%d)\n", ret);