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>
git-mirror · Mar 29, 2013 · 2e64712 · 2e64712
1 parent cea6aec
commit 2e64712
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git 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
@@ -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);
-Original file line number
+Diff line change
@@ Expand Up / @@ -211,6 +211,9 @@ void mei_stop(struct mei_device *dev) @@
     	mutex_unlock(&dev->device_lock);
     	flush_scheduled_work();
+    	mei_watchdog_unregister(dev);
     }
@@ Expand Down @@