| commit | 069e1572d78a154a342d7cf396a160823854747f | [log] [tgz] |
|---|---|---|
| author | Mark Brown <broonie@linaro.org> | Mon Jul 15 11:46:14 2013 +0100 |
| committer | Mark Brown <broonie@linaro.org> | Mon Jul 15 11:46:14 2013 +0100 |
| tree | 66f09582d32acf1062298a971842da36ac8c0fe3 | |
| parent | ad81f0545ef01ea651886dddac4bef6cec930092 [diff] | |
| parent | d96760f98e8eb9d35a2eace586d8b93b0e58cbd5 [diff] |
Merge remote-tracking branch 'spi/fix/s3c64xx' into spi-linus
diff --git a/drivers/spi/spi-s3c64xx.c b/drivers/spi/spi-s3c64xx.c index eb53df2..63e2070 100644 --- a/drivers/spi/spi-s3c64xx.c +++ b/drivers/spi/spi-s3c64xx.c
@@ -434,6 +434,9 @@ dma_cap_mask_t mask; int ret; + if (is_polling(sdd)) + return 0; + dma_cap_zero(mask); dma_cap_set(DMA_SLAVE, mask);