Eric Lee / smarc-ti-linux-kernel

2
Download as
Browse Code ยป

Commit 6c15a8516b8118eb19a59fd0bd22df41b9101c32

Authored by Alexander Usyskin
Committed by Greg Kroah-Hartman
1 parent f4c72c7030
Exists in ti-lsk-linux-4.1.y and in 10 other branches dlt-processor-sdk-linux-03.00.00.04, processor-sdk-linux-02.00.01, smarc-ti-lsk-linux-4.1.y, smarct3x-processor-sdk-04.01.00.06, smarct3x-processor-sdk-linux-02.00.01, smarct3x-processor-sdk-linux-03.00.00.04, smarct4x-800-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-04.01.00.06, smarct4x-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-linux-03.00.00.04

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>

Showing 1 changed file with 2 additions and 0 deletions Side-by-side Diff

drivers/misc/mei/init.c
Diff comments   View file @ 6c15a85
... ... @@ -341,6 +341,8 @@
341 341  
342 342 dev->dev_state = MEI_DEV_POWER_DOWN;
343 343 mei_reset(dev);
  344 + /* move device to disabled state unconditionally */
  345 + dev->dev_state = MEI_DEV_DISABLED;
344 346  
345 347 mutex_unlock(&dev->device_lock);
346 348