mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-29 11:11:45 -04:00
Merge 4.0-rc3 into char-misc-next
We want the mei fixes in here as well. Signed-off-by: Greg Kroah-Hartman <[email protected]>
This commit is contained in:
commit
e94f16a4fd
490 changed files with 4877 additions and 2578 deletions
|
|
@ -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);
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue