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

This commit is contained in:
Mark Brown
2013-07-15 11:46:14 +01:00

View File

@@ -434,6 +434,9 @@ static int s3c64xx_spi_prepare_transfer(struct spi_master *spi)
dma_cap_mask_t mask; dma_cap_mask_t mask;
int ret; int ret;
if (is_polling(sdd))
return 0;
dma_cap_zero(mask); dma_cap_zero(mask);
dma_cap_set(DMA_SLAVE, mask); dma_cap_set(DMA_SLAVE, mask);