Patch "mtd: spi-nor: cadence-quadspi: Don't initialize rx_dma_complete on failure" has been added to the 5.4-stable tree

[Sasha Levin <sashal@xxxxxxxxxx>]

This is a note to let you know that I've just added the patch titled

    mtd: spi-nor: cadence-quadspi: Don't initialize rx_dma_complete on failure

to the 5.4-stable tree which can be found at:
    http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
     mtd-spi-nor-cadence-quadspi-don-t-initialize-rx_dma_.patch
and it can be found in the queue-5.4 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.



commit bfa9dce8c5ba9ddd6f20d5b60b238109d61ab987
Author: Vignesh Raghavendra <vigneshr@xxxxxx>
Date:   Mon Jun 1 12:34:39 2020 +0530

    mtd: spi-nor: cadence-quadspi: Don't initialize rx_dma_complete on failure
    
    [ Upstream commit 48aae57f0f9f57797772bd462b4d64902b1b4ae1 ]
    
    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@xxxxxx>
    Reviewed-by: Tudor Ambarus <tudor.ambarus@xxxxxxxxxxxxx>
    Acked-by: Tudor Ambarus <tudor.ambarus@xxxxxxxxxxxxx>
    Link: https://lore.kernel.org/r/20200601070444.16923-4-vigneshr@xxxxxx
    Signed-off-by: Mark Brown <broonie@xxxxxxxxxx>
    Stable-dep-of: 2087e85bb66e ("spi: cadence-quadspi: fix suspend-resume implementations")
    Signed-off-by: Sasha Levin <sashal@xxxxxxxxxx>

diff --git a/drivers/mtd/spi-nor/cadence-quadspi.c b/drivers/mtd/spi-nor/cadence-quadspi.c
index 7e7736bbbfb3b..ad27d3e4c5dbc 100644
--- a/drivers/mtd/spi-nor/cadence-quadspi.c
+++ b/drivers/mtd/spi-nor/cadence-quadspi.c
@@ -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);
 }