summaryrefslogtreecommitdiff
path: root/drivers/spi/spi-fsl-lpspi.c
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2023-05-30 20:38:18 +0300
committerMark Brown <broonie@kernel.org>2023-05-30 20:38:18 +0300
commitfdc523137457d3547900e3dfbe5fcdd49675f6ba (patch)
tree9dd79122d566a35d8b93c92e0b77c9590f6a6ebd /drivers/spi/spi-fsl-lpspi.c
parentfe73245592fef75a7c41180a3fbb07c9a75f622e (diff)
parent0c331fd1dccfba657129380ee084b95c1cedfbef (diff)
downloadlinux-fdc523137457d3547900e3dfbe5fcdd49675f6ba.tar.xz
spi: Merge up fixes to help CI
Get the fixes into CI for development.
Diffstat (limited to 'drivers/spi/spi-fsl-lpspi.c')
-rw-r--r--drivers/spi/spi-fsl-lpspi.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/drivers/spi/spi-fsl-lpspi.c b/drivers/spi/spi-fsl-lpspi.c
index d9f8231bcea8..80f7367095ab 100644
--- a/drivers/spi/spi-fsl-lpspi.c
+++ b/drivers/spi/spi-fsl-lpspi.c
@@ -916,9 +916,14 @@ static int fsl_lpspi_probe(struct platform_device *pdev)
ret = fsl_lpspi_dma_init(&pdev->dev, fsl_lpspi, controller);
if (ret == -EPROBE_DEFER)
goto out_pm_get;
-
if (ret < 0)
dev_err(&pdev->dev, "dma setup error %d, use pio\n", ret);
+ else
+ /*
+ * disable LPSPI module IRQ when enable DMA mode successfully,
+ * to prevent the unexpected LPSPI module IRQ events.
+ */
+ disable_irq(irq);
ret = devm_spi_register_controller(&pdev->dev, controller);
if (ret < 0) {