Takashi Iwai 41844c
From 11164bc39459335ab93c6e99d53b7e4292fba38b Mon Sep 17 00:00:00 2001
Takashi Iwai 41844c
From: Jimmy Assarsson <extja@kvaser.com>
Takashi Iwai 41844c
Date: Tue, 16 May 2023 15:43:18 +0200
Takashi Iwai 41844c
Subject: [PATCH] can: kvaser_pciefd: Disable interrupts in probe error path
Takashi Iwai 41844c
Git-commit: 11164bc39459335ab93c6e99d53b7e4292fba38b
Takashi Iwai 41844c
Patch-mainline: v6.4-rc3
Takashi Iwai 41844c
References: git-fixes
Takashi Iwai 41844c
Takashi Iwai 41844c
Disable interrupts in error path of probe function.
Takashi Iwai 41844c
Takashi Iwai 41844c
Fixes: 26ad340e582d ("can: kvaser_pciefd: Add driver for Kvaser PCIEcan devices")
Takashi Iwai 41844c
Cc: stable@vger.kernel.org
Takashi Iwai 41844c
Signed-off-by: Jimmy Assarsson <extja@kvaser.com>
Takashi Iwai 41844c
Link: https://lore.kernel.org/r/20230516134318.104279-7-extja@kvaser.com
Takashi Iwai 41844c
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
Takashi Iwai 41844c
Acked-by: Takashi Iwai <tiwai@suse.de>
Takashi Iwai 41844c
Takashi Iwai 41844c
---
Takashi Iwai 41844c
 drivers/net/can/kvaser_pciefd.c | 2 ++
Takashi Iwai 41844c
 1 file changed, 2 insertions(+)
Takashi Iwai 41844c
Takashi Iwai 41844c
diff --git a/drivers/net/can/kvaser_pciefd.c b/drivers/net/can/kvaser_pciefd.c
Takashi Iwai 41844c
index 4fafb7658349..be189edb256c 100644
Takashi Iwai 41844c
--- a/drivers/net/can/kvaser_pciefd.c
Takashi Iwai 41844c
+++ b/drivers/net/can/kvaser_pciefd.c
Takashi Iwai 41844c
@@ -1861,6 +1861,8 @@ static int kvaser_pciefd_probe(struct pci_dev *pdev,
Takashi Iwai 41844c
 	return 0;
Takashi Iwai 41844c
 
Takashi Iwai 41844c
 err_free_irq:
Takashi Iwai 41844c
+	/* Disable PCI interrupts */
Takashi Iwai 41844c
+	iowrite32(0, pcie->reg_base + KVASER_PCIEFD_IEN_REG);
Takashi Iwai 41844c
 	free_irq(pcie->pci->irq, pcie);
Takashi Iwai 41844c
 
Takashi Iwai 41844c
 err_teardown_can_ctrls:
Takashi Iwai 41844c
-- 
Takashi Iwai 41844c
2.35.3
Takashi Iwai 41844c