leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mei: unregister watchdog from mei_stop function

Browse Source 
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>
This commit is contained in:
Tomas Winkler
2013-03-27 16:58:26 +02:00
committed by Greg Kroah-Hartman
parent cea6aec451
commit 2e64712450
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/misc/mei/init.c
View File

@@ -211,6 +211,9 @@ void mei_stop(struct mei_device *dev)
mutex_unlock(&dev->device_lock); mutex_unlock(&dev->device_lock);
flush_scheduled_work(); flush_scheduled_work();
mei_watchdog_unregister(dev);
} }

2
drivers/misc/mei/pci-me.c
View File

@@ -253,8 +253,6 @@ static void mei_remove(struct pci_dev *pdev)
mei_pdev = NULL; mei_pdev = NULL;
mei_watchdog_unregister(dev);
/* disable interrupts */ /* disable interrupts */
mei_disable_interrupts(dev); mei_disable_interrupts(dev);