1 files changed, 4 insertions, 3 deletions

diff --git a/drivers/acpi/apei/ghes.c b/drivers/acpi/apei/ghes.c
index 0d099a24f776..e53bef6cf53c 100644
--- a/drivers/acpi/apei/ghes.c
+++ b/drivers/acpi/apei/ghes.c
@@ -852,6 +852,8 @@ static int ghes_notify_nmi(unsigned int cmd, struct pt_regs *regs)
                 if (ghes_read_estatus(ghes, 1)) {
                         ghes_clear_estatus(ghes);
                         continue;
+                } else {
+                        ret = NMI_HANDLED;
                 }
 
                 sev = ghes_severity(ghes->estatus->error_severity);
@@ -863,12 +865,11 @@ static int ghes_notify_nmi(unsigned int cmd, struct pt_regs *regs)
 
                 __process_error(ghes);
                 ghes_clear_estatus(ghes);
-
-                ret = NMI_HANDLED;
         }
 
 #ifdef CONFIG_ARCH_HAVE_NMI_SAFE_CMPXCHG
-        irq_work_queue(&ghes_proc_irq_work);
+        if (ret == NMI_HANDLED)
+                irq_work_queue(&ghes_proc_irq_work);
 #endif
         atomic_dec(&ghes_in_nmi);
         return ret;