diff options
| author | Tomas Winkler <tomas.winkler@intel.com> | 2013-03-27 16:58:26 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-03-29 08:32:21 -0700 |
| commit | 2e64712450e30a445b5650d1205e1aaca811f084 (patch) | |
| tree | b9c864bf545d550c7fbaa8ac1883549376b50573 /drivers/misc/mei | |
| 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')
| -rw-r--r-- | drivers/misc/mei/init.c | 3 | ||||
| -rw-r--r-- | drivers/misc/mei/pci-me.c | 2 |
2 files changed, 3 insertions, 2 deletions
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); |