diff options
| author | Alexander Usyskin <alexander.usyskin@intel.com> | 2015-02-10 09:36:36 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-03-02 04:34:50 +0100 |
| commit | 6c15a8516b8118eb19a59fd0bd22df41b9101c32 (patch) | |
| tree | a025fb7ee0316150f02ee5cb36186dfe9ca1e08d | |
| parent | android: binder: fix binder mmap failures (diff) | |
| download | linux-6c15a8516b8118eb19a59fd0bd22df41b9101c32.tar.xz linux-6c15a8516b8118eb19a59fd0bd22df41b9101c32.zip | |
mei: make device disabled on stop unconditionally
Set the internal device state to to disabled after hardware reset in stop flow.
This will cover cases when driver was not brought to disabled state because of
an error and in stop flow we wish not to retry the reset.
Cc: <stable@vger.kernel.org> #3.10+
Signed-off-by: Alexander Usyskin <alexander.usyskin@intel.com>
Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | drivers/misc/mei/init.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/misc/mei/init.c b/drivers/misc/mei/init.c index 9306219d5675..6ad049a08e4d 100644 --- a/drivers/misc/mei/init.c +++ b/drivers/misc/mei/init.c @@ -341,6 +341,8 @@ void mei_stop(struct mei_device *dev) dev->dev_state = MEI_DEV_POWER_DOWN; mei_reset(dev); + /* move device to disabled state unconditionally */ + dev->dev_state = MEI_DEV_DISABLED; mutex_unlock(&dev->device_lock); |