Merge remote-tracking branches 'spi/topic/ti-qspi' and 'spi/topic/xlp' into spi-next

[mirror_ubuntu-artful-kernel.git] / drivers / spi / spi.c

diff --git a/drivers/spi/spi.c b/drivers/spi/spi.c
index 2c36c0ac708ab7d4e2b7d2123fbf00136bec6e5a..89254a55eb2e78c44e2a2c27bc693d9af623662b 100644 (file)
--- a/drivers/spi/spi.c
+++ b/drivers/spi/spi.c
@@ -2854,7 +2854,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,