]> git.baikalelectronics.ru Git - kernel.git/commitdiff
mtd: spi-nor: cadence-quadspi: Don't initialize rx_dma_complete on failure
authorVignesh Raghavendra <vigneshr@ti.com>
Mon, 1 Jun 2020 07:04:39 +0000 (12:34 +0530)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 17 May 2023 09:35:48 +0000 (11:35 +0200)
[ Upstream commit 4a609e4b9be1e479846a99e36be54bfb24ad2504 ]

If driver fails to acquire DMA channel then don't initialize
rx_dma_complete struct as it won't be used.

Signed-off-by: Vignesh Raghavendra <vigneshr@ti.com>
Reviewed-by: Tudor Ambarus <tudor.ambarus@microchip.com>
Acked-by: Tudor Ambarus <tudor.ambarus@microchip.com>
Link: https://lore.kernel.org/r/20200601070444.16923-4-vigneshr@ti.com
Signed-off-by: Mark Brown <broonie@kernel.org>
Stable-dep-of: 2087e85bb66e ("spi: cadence-quadspi: fix suspend-resume implementations")
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/mtd/spi-nor/cadence-quadspi.c

index 7e7736bbbfb3b12ec2030c8764de605c485ca57c..ad27d3e4c5dbc86692c4dbea509c07de6873f02b 100644 (file)
@@ -1179,6 +1179,7 @@ static void cqspi_request_mmap_dma(struct cqspi_st *cqspi)
        if (IS_ERR(cqspi->rx_chan)) {
                dev_err(&cqspi->pdev->dev, "No Rx DMA available\n");
                cqspi->rx_chan = NULL;
+               return;
        }
        init_completion(&cqspi->rx_dma_complete);
 }