Browse Source

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

Mark Brown 12 years ago
parent
commit
069e1572d7
1 changed files with 3 additions and 0 deletions
  1. 3 0
      drivers/spi/spi-s3c64xx.c

+ 3 - 0
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);