summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGirish K S <girishks2000@gmail.com>2013-06-27 12:26:53 +0530
committerMark Brown <broonie@linaro.org>2013-07-15 11:43:14 +0100
commit9f4b323803ff18d87dcc042723b527ee646dddfc (patch)
tree66f09582d32acf1062298a971842da36ac8c0fe3
parentad81f0545ef01ea651886dddac4bef6cec930092 (diff)
spi: s3c64xx: add missing check for polling mode
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>
-rw-r--r--drivers/spi/spi-s3c64xx.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/spi/spi-s3c64xx.c b/drivers/spi/spi-s3c64xx.c
index eb53df27e7ea..63e2070c6c14 100644
--- 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);