From: Tomas Winkler <tomas.winkler@intel.com>
Date: Wed, 27 Mar 2013 14:58:26 +0000 (+0200)
Subject: mei: unregister watchdog from mei_stop function
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=2e64712450e30a445b5650d1205e1aaca811f084;p=deliverable%2Flinux.git

mei: unregister watchdog from mei_stop function

we need to unregister watchdog device both in suspend and remove
as the registration is recreated on reset

Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---

diff --git a/drivers/misc/mei/init.c b/drivers/misc/mei/init.c
index 09a9980303b4..aced38c9f6a8 100644
--- a/drivers/misc/mei/init.c
+++ b/drivers/misc/mei/init.c
@@ -211,6 +211,9 @@ void mei_stop(struct mei_device *dev)
 	mutex_unlock(&dev->device_lock);
 
 	flush_scheduled_work();
+
+	mei_watchdog_unregister(dev);
+
 }
 
 
diff --git a/drivers/misc/mei/pci-me.c b/drivers/misc/mei/pci-me.c
index b8b5c9c3ad03..252b1fd315a8 100644
--- a/drivers/misc/mei/pci-me.c
+++ b/drivers/misc/mei/pci-me.c
@@ -253,8 +253,6 @@ static void mei_remove(struct pci_dev *pdev)
 
 	mei_pdev = NULL;
 
-	mei_watchdog_unregister(dev);
-
 	/* disable interrupts */
 	mei_disable_interrupts(dev);