From: Tomas Winkler <tomas.winkler@intel.com>
Date: Wed, 17 Jul 2013 12:13:16 +0000 (+0300)
Subject: mei: don't have to clean the state on power up
X-Git-Tag: v3.10.10~4
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=47e1cf336bc708bb59ebfcc01540dffecd16862e;p=thirdparty%2Fkernel%2Fstable.git

mei: don't have to clean the state on power up

commit 99f22c4ef24cf87b0dae6aabe6b5e620b62961d9 upstream.

When powering up, we don't have to clean up the device state
nothing is connected.

Tested-by: Shuah Khan <shuah.kh@samsung.com>
Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---

diff --git a/drivers/misc/mei/init.c b/drivers/misc/mei/init.c
index f580d30bb7842..6eec689ba97ef 100644
--- a/drivers/misc/mei/init.c
+++ b/drivers/misc/mei/init.c
@@ -143,7 +143,8 @@ 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;