diff options
| author | Tomas Winkler | 2013-07-17 14:13:16 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2013-07-24 04:31:35 +0200 |
| commit | 99f22c4ef24cf87b0dae6aabe6b5e620b62961d9 (patch) | |
| tree | 9d9d11ec17e1b52ed8f3c5f9eb5d49979282a711 /drivers/misc/mei | |
| parent | mei: me: fix reset state machine (diff) | |
| download | kernel-qcow2-linux-99f22c4ef24cf87b0dae6aabe6b5e620b62961d9.tar.gz kernel-qcow2-linux-99f22c4ef24cf87b0dae6aabe6b5e620b62961d9.tar.xz kernel-qcow2-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/mei')
| -rw-r--r-- | drivers/misc/mei/init.c | 3 |
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; |