diff options
author | Tomas Winkler <tomas.winkler@intel.com> | 2013-03-27 10:58:26 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-03-29 11:32:21 -0400 |
commit | 2e64712450e30a445b5650d1205e1aaca811f084 (patch) | |
tree | b9c864bf545d550c7fbaa8ac1883549376b50573 /drivers/misc/mei/pci-me.c | |
parent | cea6aec451586afef2bace28d08145a869131b5b (diff) |
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>
Diffstat (limited to 'drivers/misc/mei/pci-me.c')
-rw-r--r-- | drivers/misc/mei/pci-me.c | 2 |
1 files changed, 0 insertions, 2 deletions
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) | |||
253 | 253 | ||
254 | mei_pdev = NULL; | 254 | mei_pdev = NULL; |
255 | 255 | ||
256 | mei_watchdog_unregister(dev); | ||
257 | |||
258 | /* disable interrupts */ | 256 | /* disable interrupts */ |
259 | mei_disable_interrupts(dev); | 257 | mei_disable_interrupts(dev); |
260 | 258 | ||