From c5d86f08db125cadddf9afe03a791383da04926e Mon Sep 17 00:00:00 2001 From: Vipin Deep Kaur Date: Tue, 30 Jun 2020 14:46:44 +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 67192635d468 ("spi: spi-geni-qcom: Check for zero length transfer")'. Change-Id: I27bdd8b544ba1bdaa0a868d2260c4f76c156c215 Signed-off-by: Vipin Deep Kaur --- drivers/spi/spi-msm-geni.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/drivers/spi/spi-msm-geni.c b/drivers/spi/spi-msm-geni.c index cebb104ba372..144f8567041c 100644 --- a/drivers/spi/spi-msm-geni.c +++ b/drivers/spi/spi-msm-geni.c @@ -1213,6 +1213,12 @@ static int spi_geni_transfer_one(struct spi_master *spi, return -EINVAL; } + /* Check for zero length transfer */ + if (xfer->len < 1) { + dev_err(mas->dev, "Zero length transfer\n"); + return -EINVAL; + } + if (mas->cur_xfer_mode != GSI_DMA) { reinit_completion(&mas->xfer_done); setup_fifo_xfer(xfer, mas, slv->mode, spi);