Merge remote-tracking branch 'spi/fix/s3c64xx' into spi-linus

diff --git a/drivers/spi/spi-s3c64xx.c b/drivers/spi/spi-s3c64xx.c
index eb53df27e7ea81af4eefa2912da48565724d6aaa..63e2070c6c14aa8e39a64a850248e07a38546708 100644 (file)
--- a/drivers/spi/spi-s3c64xx.c
+++ b/drivers/spi/spi-s3c64xx.c
@@ -434,6 +434,9 @@ static int s3c64xx_spi_prepare_transfer(struct spi_master *spi)
        dma_cap_mask_t mask;
        int ret;
 
+       if (is_polling(sdd))
+               return 0;
+
        dma_cap_zero(mask);
        dma_cap_set(DMA_SLAVE, mask);