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

069e1572 · Mark Brown · ad81f054 · d96760f9 · 069e1572
Commit 069e1572 authored Jul 15, 2013 by Mark Brown
Show whitespace changes
Inline Side-by-side

Showing with 3 additions and 0 deletions

drivers/spi/spi-s3c64xx.c drivers/spi/spi-s3c64xx.c +3 -0

No files found.
--- 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);