From: Robin Gong Date: Tue, 10 Nov 2015 10:06:53 +0000 (+0800) Subject: MLK-11848-1 spi: spi: Revert "spi: check tx_buf and rx_buf in spi_unmap_msg" X-Git-Tag: C0P2-H0.0--20200415~4042 X-Git-Url: https://git.somdevices.com/?a=commitdiff_plain;h=b01cbfc09a00f0efc7ce5300ca13105ee254d895;p=linux.git MLK-11848-1 spi: spi: Revert "spi: check tx_buf and rx_buf in spi_unmap_msg" This commit 06634f8a25f4c5e4ff0c0ef5368a48eb394db63b cherry-picked wrong, and that cause SPI DMA mode never works. Actually, no need this patch since this patch has already been upsteaminged as below: commit f8bb820da4ae863c676156627973a950129559fb Author: Robin Gong Date: Thu Apr 16 10:54:18 2015 +0800 spi: check tx_buf and rx_buf in spi_unmap_msg Signed-off-by: Robin Gong --- diff --git a/drivers/spi/spi.c b/drivers/spi/spi.c index 257e152e4456..6db80635ace8 100644 --- a/drivers/spi/spi.c +++ b/drivers/spi/spi.c @@ -807,15 +807,6 @@ static int __spi_map_msg(struct spi_master *master, struct spi_message *msg) rx_dev = master->dev.parent; list_for_each_entry(xfer, &msg->transfers, transfer_list) { - /* - * Restore the original value of tx_buf or rx_buf if they are - * NULL. - */ - if (xfer->tx_buf == master->dummy_tx) - xfer->tx_buf = NULL; - if (xfer->rx_buf == master->dummy_rx) - xfer->rx_buf = NULL; - if (!master->can_dma(master, msg->spi, xfer)) continue;