From: Mark Brown <broonie@linaro.org>
Date: Mon, 15 Jul 2013 10:46:14 +0000 (+0100)
Subject: Merge remote-tracking branch 'spi/fix/s3c64xx' into spi-linus
X-Git-Tag: next-20130717~82^2~2^2~2
X-Git-Url: https://git.kernelconcepts.de/?p=karo-tx-linux.git;a=commitdiff_plain;h=069e1572d78a154a342d7cf396a160823854747f;hp=ad81f0545ef01ea651886dddac4bef6cec930092

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 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);