diff options
author | Vignesh R <vigneshr@ti.com> | 2017-04-11 13:52:24 +0200 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2017-04-21 19:03:53 +0200 |
commit | 2bca34455b257d75080d87e800ae14afe49001bf (patch) | |
tree | 240df51d9b322b51df8eb04e81b7580d8acb32fa /drivers/spi | |
parent | spi: spi-ti-qspi: Remove unused dma_dev variable (diff) | |
download | linux-2bca34455b257d75080d87e800ae14afe49001bf.tar.xz linux-2bca34455b257d75080d87e800ae14afe49001bf.zip |
spi: Add can_dma like interface for spi_flash_read
Add an interface analogous to ->can_dma() for spi_flash_read()
interface. This will enable SPI controller drivers to inform SPI core
when not to do DMA mappings.
Signed-off-by: Vignesh R <vigneshr@ti.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'drivers/spi')
-rw-r--r-- | drivers/spi/spi.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/spi/spi.c b/drivers/spi/spi.c index 656dd3e3220c..5e1bb43b8a8f 100644 --- a/drivers/spi/spi.c +++ b/drivers/spi/spi.c @@ -2811,7 +2811,7 @@ int spi_flash_read(struct spi_device *spi, mutex_lock(&master->bus_lock_mutex); mutex_lock(&master->io_mutex); - if (master->dma_rx) { + if (master->dma_rx && master->spi_flash_can_dma(spi, msg)) { rx_dev = master->dma_rx->device->dev; ret = spi_map_buf(master, rx_dev, &msg->rx_sg, msg->buf, msg->len, |