diff --git a/drivers/gpu/nvgpu/gk20a/gk20a.c b/drivers/gpu/nvgpu/gk20a/gk20a.c
index 91c82104a..79c3fd09f 100644
--- a/drivers/gpu/nvgpu/gk20a/gk20a.c
+++ b/drivers/gpu/nvgpu/gk20a/gk20a.c
@@ -1098,6 +1098,7 @@ int gk20a_pm_finalize_poweron(struct device *dev)
 	enable_irq(g->irq_stall);
 	if (g->irq_stall != g->irq_nonstall)
 		enable_irq(g->irq_nonstall);
+	g->irqs_enabled = 1;
 
 	if (g->ops.xve.available_speeds) {
 		u32 speed;
diff --git a/drivers/gpu/nvgpu/gk20a/gk20a.h b/drivers/gpu/nvgpu/gk20a/gk20a.h
index 196af3c16..31b023783 100644
--- a/drivers/gpu/nvgpu/gk20a/gk20a.h
+++ b/drivers/gpu/nvgpu/gk20a/gk20a.h
@@ -990,6 +990,7 @@ struct gk20a {
 
 	struct gpu_ops ops;
 
+	int irqs_enabled;
 	int irq_stall; /* can be same as irq_nonstall in case of PCI */
 	int irq_nonstall;
 	u32 max_ltc_count;
diff --git a/drivers/gpu/nvgpu/pci.c b/drivers/gpu/nvgpu/pci.c
index a81090a24..3677b02d6 100644
--- a/drivers/gpu/nvgpu/pci.c
+++ b/drivers/gpu/nvgpu/pci.c
@@ -439,7 +439,9 @@ static void nvgpu_pci_remove(struct pci_dev *pdev)
 	gk20a_dbg(gpu_dbg_shutdown, "Removing nvgpu driver!\n");
 	gk20a_driver_start_unload(g);
 
-	disable_irq(g->irq_stall);
+	if (g->irqs_enabled)
+		disable_irq(g->irq_stall);
+
 	devm_free_irq(&pdev->dev, g->irq_stall, g);
 
 #if defined(CONFIG_PCI_MSI)