Commit 069e1572 authored by Mark Brown's avatar Mark Brown

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

parents ad81f054 d96760f9
...@@ -434,6 +434,9 @@ static int s3c64xx_spi_prepare_transfer(struct spi_master *spi) ...@@ -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);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment