---

yaml --- r: 348002 b: refs/heads/master c: d692170 h: refs/heads/master v: v3
git-mirror · Dec 19, 2012 · 29cf824 · 29cf824
1 parent 00a277e
commit 29cf824
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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);