From 67ec5c3b8f20604113213af0e1d2dca6e29ec613 Mon Sep 17 00:00:00 2001 From: Vipin Deep Kaur Date: Tue, 30 Jun 2020 14:25:17 +0530 Subject: [PATCH] spi: spi-msm-geni: Propagate missing change from 4.19 to 5.4 Propagate following change from 4.19 to 5.4 for SPI driver. 'commit 64485a92b029 ("spi: spi-geni-qcom: Check for Rx DMA channel being null")'. Change-Id: I0dc30e38d0cbbab21d26eeab17b40b14017d48ff Signed-off-by: Vipin Deep Kaur --- drivers/spi/spi-msm-geni.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/spi/spi-msm-geni.c b/drivers/spi/spi-msm-geni.c index 2d13016dc500..30c6a9a7a5e4 100644 --- a/drivers/spi/spi-msm-geni.c +++ b/drivers/spi/spi-msm-geni.c @@ -860,6 +860,7 @@ static int spi_geni_prepare_transfer_hardware(struct spi_master *spi) dev_info(mas->dev, "Failed to get rx DMA ch %ld\n", PTR_ERR(mas->rx)); dma_release_channel(mas->tx); + goto setup_ipc; } mas->gsi = devm_kzalloc(mas->dev, (sizeof(struct spi_geni_gsi) * NUM_SPI_XFER),