diff options
| author | Robin Gong <b38343@freescale.com> | 2015-11-10 18:06:53 +0800 |
|---|---|---|
| committer | Nitin Garg <nitin.garg@nxp.com> | 2016-01-14 11:02:21 -0600 |
| commit | 0bd062359d1067cb97c3a85ba2aedf6f375e0c1e (patch) | |
| tree | 7a3d2be3f4897bec757d813d31c6edfc30817530 /drivers/spi | |
| parent | 0148f836e06946887fb4ce29a606463b18b17b19 (diff) | |
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 <b38343@freescale.com>
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 <b38343@freescale.com>
Diffstat (limited to 'drivers/spi')
| -rw-r--r-- | drivers/spi/spi.c | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/drivers/spi/spi.c b/drivers/spi/spi.c index 82d0b74ee1a4..029dbd33b4b2 100644 --- a/drivers/spi/spi.c +++ b/drivers/spi/spi.c @@ -543,15 +543,6 @@ static int __spi_map_msg(struct spi_master *master, struct spi_message *msg) rx_dev = master->dma_rx->device->dev; 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; |