aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/misc/mei/init.c
diff options
context:
space:
mode:
authorTomas Winkler <tomas.winkler@intel.com>2013-03-27 10:58:26 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-03-29 11:32:21 -0400
commit2e64712450e30a445b5650d1205e1aaca811f084 (patch)
treeb9c864bf545d550c7fbaa8ac1883549376b50573 /drivers/misc/mei/init.c
parentcea6aec451586afef2bace28d08145a869131b5b (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/init.c')
-rw-r--r--drivers/misc/mei/init.c3
1 files changed, 3 insertions, 0 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)
211 mutex_unlock(&dev->device_lock); 211 mutex_unlock(&dev->device_lock);
212 212
213 flush_scheduled_work(); 213 flush_scheduled_work();
214
215 mei_watchdog_unregister(dev);
216
214} 217}
215 218
216 219