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/init.c | |
| parent | cea6aec451586afef2bace28d08145a869131b5b (diff) | |
| download | op-kernel-dev-2e64712450e30a445b5650d1205e1aaca811f084.zip op-kernel-dev-2e64712450e30a445b5650d1205e1aaca811f084.tar.gz | |
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.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/misc/mei/init.c b/drivers/misc/mei/init.c index 09a9980..aced38c 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); + } |
