From 29cf8246f9170fa3d9792792c7b5e8b1904702e8 Mon Sep 17 00:00:00 2001
From: Tomas Winkler <tomas.winkler@intel.com>
Date: Sun, 16 Dec 2012 13:23:17 +0200
Subject: [PATCH] --- yaml --- r: 348002 b: refs/heads/master c:
 d692170037c0338b31dac5ac4722c1360a4b5257 h: refs/heads/master v: v3

---
 [refs]                      | 2 +-
 trunk/drivers/misc/mei/wd.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index a38b6b5c4fda..53415eef18f5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8c4c419ca3bd5a5b3389114e037a9d17bdec3a5f
+refs/heads/master: d692170037c0338b31dac5ac4722c1360a4b5257
diff --git a/trunk/drivers/misc/mei/wd.c b/trunk/drivers/misc/mei/wd.c
index 636409f9667f..9299a8c29a6f 100644
--- a/trunk/drivers/misc/mei/wd.c
+++ b/trunk/drivers/misc/mei/wd.c
@@ -370,7 +370,7 @@ void mei_watchdog_register(struct mei_device *dev)
 
 void mei_watchdog_unregister(struct mei_device *dev)
 {
-	if (test_bit(WDOG_UNREGISTERED, &amt_wd_dev.status))
+	if (watchdog_get_drvdata(&amt_wd_dev) == NULL)
 		return;
 
 	watchdog_set_drvdata(&amt_wd_dev, NULL);