summaryrefslogtreecommitdiffstats
path: root/drivers/misc
diff options
context:
space:
mode:
authorTomas Winkler <tomas.winkler@intel.com>2013-07-17 15:13:16 +0300
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-07-23 19:31:35 -0700
commit99f22c4ef24cf87b0dae6aabe6b5e620b62961d9 (patch)
tree9d9d11ec17e1b52ed8f3c5f9eb5d49979282a711 /drivers/misc
parent315a383ad7dbd484fafb93ef08038e3dbafbb7a8 (diff)
downloadlinux-99f22c4ef24cf87b0dae6aabe6b5e620b62961d9.tar.gz
linux-99f22c4ef24cf87b0dae6aabe6b5e620b62961d9.tar.bz2
linux-99f22c4ef24cf87b0dae6aabe6b5e620b62961d9.zip
mei: don't have to clean the state on power up
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>
Diffstat (limited to 'drivers/misc')
-rw-r--r--drivers/misc/mei/init.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/misc/mei/init.c b/drivers/misc/mei/init.c
index ed1d75203af6..e6f16f83ecde 100644
--- a/drivers/misc/mei/init.c
+++ b/drivers/misc/mei/init.c
@@ -148,7 +148,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;