2 files changed, 10 insertions, 1 deletions

diff --git a/drivers/misc/mei/hw-me.c b/drivers/misc/mei/hw-me.c
index 7e769c59a420..7145929cdb51 100644
--- a/drivers/misc/mei/hw-me.c
+++ b/drivers/misc/mei/hw-me.c
@@ -507,7 +507,16 @@ irqreturn_t mei_me_irq_thread_handler(int irq, void *dev_id)
         while (slots > 0) {
                 dev_dbg(&dev->pdev->dev, "slots to read = %08x\n", slots);
                 rets = mei_irq_read_handler(dev, &complete_list, &slots);
+                /* There is a race between ME write and interrupt delivery:
+                 * Not all data is always available immediately after the
+                 * interrupt, so try to read again on the next interrupt.
+                 */
+                if (rets == -ENODATA)
+                        break;
+
                 if (rets && dev->dev_state != MEI_DEV_RESETTING) {
+                        dev_err(&dev->pdev->dev, "mei_irq_read_handler ret = %d.\n",
+                                                rets);
                         schedule_work(&dev->reset_work);
                         goto end;
                 }
diff --git a/drivers/misc/mei/interrupt.c b/drivers/misc/mei/interrupt.c
index 2fbf0c0625ed..f38a32addad0 100644
--- a/drivers/misc/mei/interrupt.c
+++ b/drivers/misc/mei/interrupt.c
@@ -351,7 +351,7 @@ int mei_irq_read_handler(struct mei_device *dev,
                 dev_err(&dev->pdev->dev, "less data available than length=%08x.\n",
                                 *slots);
                 /* we can't read the message */
-                ret = -EBADMSG;
+                ret = -ENODATA;
                 goto end;
         }