xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge 3.11-rc3 into char-misc-next.

Browse Source 
This resolves a merge issue with:
	drivers/misc/mei/init.c

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Greg Kroah-Hartman
2013-07-29 11:50:17 -07:00
parent ecda040ff3 5ae90d8e46
commit 9c5891bd43
339 changed files with 6949 additions and 4823 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/misc/mei/init.c
View File

@@ -148,13 +148,12 @@ void mei_reset(struct mei_device *dev, int interrupts_enabled)
dev->hbm_state = MEI_HBM_IDLE;
if (dev->dev_state != MEI_DEV_INITIALIZING) {
if (dev->dev_state != MEI_DEV_INITIALIZING &&
dev->dev_state != MEI_DEV_POWER_UP) {
if (dev->dev_state != MEI_DEV_DISABLED &&
dev->dev_state != MEI_DEV_POWER_DOWN)
dev->dev_state = MEI_DEV_RESETTING;
/* remove all waiting requests */
mei_cl_all_write_clear(dev);