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

git-mirror · Jul 15, 2013 · 069e157 · 069e157
2 parents ad81f05 + d96760f
commit 069e157
Showing 1 changed file with 3 additions and 0 deletions.
diff --git 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);