1 files changed, 7 insertions, 1 deletions

diff --git a/drivers/misc/mei/init.c b/drivers/misc/mei/init.c
index 79e9e1c30562..15253886f37e 100644
--- a/drivers/misc/mei/init.c
+++ b/drivers/misc/mei/init.c
@@ -132,13 +132,19 @@ EXPORT_SYMBOL_GPL(mei_start);
 void mei_reset(struct mei_device *dev, int interrupts_enabled)
 {
         bool unexpected;
+        int ret;
 
         unexpected = (dev->dev_state != MEI_DEV_INITIALIZING &&
                         dev->dev_state != MEI_DEV_DISABLED &&
                         dev->dev_state != MEI_DEV_POWER_DOWN &&
                         dev->dev_state != MEI_DEV_POWER_UP);
 
-        mei_hw_reset(dev, interrupts_enabled);
+        ret = mei_hw_reset(dev, interrupts_enabled);
+        if (ret) {
+                dev_err(&dev->pdev->dev, "hw reset failed disabling the device\n");
+                interrupts_enabled = false;
+                dev->dev_state = MEI_DEV_DISABLED;
+        }
 
         dev->hbm_state = MEI_HBM_IDLE;