From: Alexander Usyskin <alexander.usyskin@intel.com>
Date: Tue, 10 Feb 2015 08:36:36 +0000 (+0200)
Subject: mei: make device disabled on stop unconditionally
X-Git-Tag: v3.18.10~94
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=85f1ab830872695c6b414c87ad5d2730b52cb23d;p=thirdparty%2Fkernel%2Fstable.git

mei: make device disabled on stop unconditionally

commit 6c15a8516b8118eb19a59fd0bd22df41b9101c32 upstream.

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.

Signed-off-by: Alexander Usyskin <alexander.usyskin@intel.com>
Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>
Signed-off-by: Sasha Levin <sasha.levin@oracle.com>
---

diff --git a/drivers/misc/mei/init.c b/drivers/misc/mei/init.c
index 7901d076c1270..6c267162f151e 100644
--- a/drivers/misc/mei/init.c
+++ b/drivers/misc/mei/init.c
@@ -313,6 +313,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);