]> git.karo-electronics.de Git - linux-beck.git/commitdiff
spi: s3c64xx: add missing check for polling mode
authorGirish K S <girishks2000@gmail.com>
Thu, 27 Jun 2013 06:56:53 +0000 (12:26 +0530)
committerMark Brown <broonie@linaro.org>
Mon, 15 Jul 2013 10:43:14 +0000 (11:43 +0100)
Due to changes in mainline prior to submission the spi device detection
in polling mode breaks. This revealed the missing check for polling
during dma prepare. This patch adds the missing check.

Signed-off-by: Girish K S <ks.giri@samsung.com>
Signed-off-by: Mark Brown <broonie@linaro.org>
drivers/spi/spi-s3c64xx.c

index eb53df27e7ea81af4eefa2912da48565724d6aaa..63e2070c6c14aa8e39a64a850248e07a38546708 100644 (file)
@@ -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);