diff options
| author | Ingo Molnar <mingo@kernel.org> | 2013-08-16 19:40:23 +0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2013-08-16 19:40:23 +0400 |
| commit | d3ec3a1fd08f705d1b319db4113590944bcde749 (patch) | |
| tree | 598a0da59e027b455f11beab24a96ef1e56fbbcb /drivers/misc/mei/init.c | |
| parent | 8f898fbbe5ee5e20a77c4074472a1fd088dc47d1 (diff) | |
| parent | d4e4ab86bcba5a72779c43dc1459f71fea3d89c8 (diff) | |
| download | linux-d3ec3a1fd08f705d1b319db4113590944bcde749.tar.xz | |
Merge tag 'v3.11-rc5' into sched/core
Merge Linux 3.11-rc5, to pick up the latest fixes.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/misc/mei/init.c')
| -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; |