diff options
Diffstat (limited to 'drivers/misc/mei/init.c')
-rw-r--r-- | drivers/misc/mei/init.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/misc/mei/init.c b/drivers/misc/mei/init.c index 557eed2a1595..92c73118b13c 100644 --- a/drivers/misc/mei/init.c +++ b/drivers/misc/mei/init.c | |||
@@ -148,13 +148,12 @@ void mei_reset(struct mei_device *dev, int interrupts_enabled) | |||
148 | 148 | ||
149 | dev->hbm_state = MEI_HBM_IDLE; | 149 | dev->hbm_state = MEI_HBM_IDLE; |
150 | 150 | ||
151 | if (dev->dev_state != MEI_DEV_INITIALIZING) { | 151 | if (dev->dev_state != MEI_DEV_INITIALIZING && |
152 | 152 | dev->dev_state != MEI_DEV_POWER_UP) { | |
153 | if (dev->dev_state != MEI_DEV_DISABLED && | 153 | if (dev->dev_state != MEI_DEV_DISABLED && |
154 | dev->dev_state != MEI_DEV_POWER_DOWN) | 154 | dev->dev_state != MEI_DEV_POWER_DOWN) |
155 | dev->dev_state = MEI_DEV_RESETTING; | 155 | dev->dev_state = MEI_DEV_RESETTING; |
156 | 156 | ||
157 | |||
158 | /* remove all waiting requests */ | 157 | /* remove all waiting requests */ |
159 | mei_cl_all_write_clear(dev); | 158 | mei_cl_all_write_clear(dev); |
160 | 159 | ||