1 files changed, 1 insertions, 3 deletions

diff --git a/drivers/gpu/nvgpu/pci.c b/drivers/gpu/nvgpu/pci.c
index 39559dac..69e16267 100644
--- a/drivers/gpu/nvgpu/pci.c
+++ b/drivers/gpu/nvgpu/pci.c
@@ -236,8 +236,7 @@ static irqreturn_t nvgpu_pci_isr(int irq, void *dev_id)
                 g->ops.xve.rearm_msi(g);
 #endif
 
-        return (ret_stall == IRQ_NONE && ret_nonstall == IRQ_NONE) ?
-                IRQ_NONE : IRQ_WAKE_THREAD;
+        return (ret_stall == IRQ_NONE) ? ret_nonstall : IRQ_WAKE_THREAD;
 }
 
 static irqreturn_t nvgpu_pci_intr_thread(int irq, void *dev_id)
@@ -245,7 +244,6 @@ static irqreturn_t nvgpu_pci_intr_thread(int irq, void *dev_id)
         struct gk20a *g = dev_id;
 
         g->ops.mc.isr_thread_stall(g);
-        g->ops.mc.isr_thread_nonstall(g);
 
         return IRQ_HANDLED;
 }