diff options
| author | Mark Brown <broonie@linaro.org> | 2013-07-15 11:46:14 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-07-15 11:46:14 +0100 |
| commit | 069e1572d78a154a342d7cf396a160823854747f (patch) | |
| tree | 66f09582d32acf1062298a971842da36ac8c0fe3 /drivers/spi | |
| parent | ad81f0545ef01ea651886dddac4bef6cec930092 (diff) | |
| parent | d96760f98e8eb9d35a2eace586d8b93b0e58cbd5 (diff) | |
| download | op-kernel-dev-069e1572d78a154a342d7cf396a160823854747f.zip op-kernel-dev-069e1572d78a154a342d7cf396a160823854747f.tar.gz | |
Merge remote-tracking branch 'spi/fix/s3c64xx' into spi-linus
Diffstat (limited to 'drivers/spi')
| -rw-r--r-- | drivers/spi/spi-s3c64xx.c | 3 |
1 files changed, 3 insertions, 0 deletions
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 @@ 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); |
