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

2013-07-15 11:46:14 +01:00 · 2013-07-15 11:46:14 +01:00 · 069e1572d7
parent ad81f0545e d96760f98e
commit 069e1572d7
1 changed files with 3 additions and 0 deletions
--- 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);