diff options
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/misc/mei/init.c | 6 | ||||
| -rw-r--r-- | drivers/misc/mei/mei_dev.h | 1 |
2 files changed, 1 insertions, 6 deletions
diff --git a/drivers/misc/mei/init.c b/drivers/misc/mei/init.c index 70fad4e..2391832 100644 --- a/drivers/misc/mei/init.c +++ b/drivers/misc/mei/init.c @@ -199,10 +199,8 @@ void mei_reset(struct mei_device *dev, int interrupts_enabled) struct mei_cl_cb *cb_next = NULL; bool unexpected; - if (dev->dev_state == MEI_DEV_RECOVERING_FROM_RESET) { - dev->need_reset = true; + if (dev->dev_state == MEI_DEV_RECOVERING_FROM_RESET) return; - } unexpected = (dev->dev_state != MEI_DEV_INITIALIZING && dev->dev_state != MEI_DEV_DISABLED && @@ -224,8 +222,6 @@ void mei_reset(struct mei_device *dev, int interrupts_enabled) dev_dbg(&dev->pdev->dev, "currently saved host_hw_state = 0x%08x.\n", dev->host_hw_state); - dev->need_reset = false; - if (dev->dev_state != MEI_DEV_INITIALIZING) { if (dev->dev_state != MEI_DEV_DISABLED && dev->dev_state != MEI_DEV_POWER_DOWN) diff --git a/drivers/misc/mei/mei_dev.h b/drivers/misc/mei/mei_dev.h index dcd7a44..e42db31 100644 --- a/drivers/misc/mei/mei_dev.h +++ b/drivers/misc/mei/mei_dev.h @@ -260,7 +260,6 @@ struct mei_device { enum mei_dev_state dev_state; enum mei_init_clients_states init_clients_state; u16 init_clients_timer; - bool need_reset; unsigned char rd_msg_buf[MEI_RD_MSG_BUF_SIZE]; /* control messages */ u32 rd_msg_hdr; |