1 files changed, 8 insertions, 5 deletions

diff --git a/drivers/misc/mei/init.c b/drivers/misc/mei/init.c
index 7929e14627ba..557eed2a1595 100644
--- a/drivers/misc/mei/init.c
+++ b/drivers/misc/mei/init.c
@@ -149,12 +149,20 @@ 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_DISABLED &&
                     dev->dev_state != MEI_DEV_POWER_DOWN)
                         dev->dev_state = MEI_DEV_RESETTING;
 
+
+                /* remove all waiting requests */
+                mei_cl_all_write_clear(dev);
+
                 mei_cl_all_disconnect(dev);
 
+                /* wake up all readings so they can be interrupted */
+                mei_cl_all_wakeup(dev);
+
                 /* remove entry if already in list */
                 dev_dbg(&dev->pdev->dev, "remove iamthif and wd from the file list.\n");
                 mei_cl_unlink(&dev->wd_cl);
@@ -195,11 +203,6 @@ void mei_reset(struct mei_device *dev, int interrupts_enabled)
 
         mei_hbm_start_req(dev);
 
-        /* wake up all readings so they can be interrupted */
-        mei_cl_all_wakeup(dev);
-
-        /* remove all waiting requests */
-        mei_cl_all_write_clear(dev);
 }
 EXPORT_SYMBOL_GPL(mei_reset);