diff options
| author | Mark Brown <broonie@linaro.org> | 2013-08-29 14:59:05 +0200 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-08-29 14:59:05 +0200 |
| commit | b5f9a9d5113efe11a3b9dad600a6f833274da595 (patch) | |
| tree | 6db5fb34a2d590086e25f7f682fecb5f43e6b283 /drivers/spi/spi-s3c64xx.c | |
| parent | spi: Use dev_get_drvdata at appropriate places (diff) | |
| parent | spi: spi-rspi: fix inconsistent spin_lock_irqsave (diff) | |
| download | linux-b5f9a9d5113efe11a3b9dad600a6f833274da595.tar.xz linux-b5f9a9d5113efe11a3b9dad600a6f833274da595.zip | |
Merge remote-tracking branch 'spi/topic/rspi' into spi-pdata
Conflicts:
drivers/spi/spi-rspi.c
Diffstat (limited to 'drivers/spi/spi-s3c64xx.c')
| -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 25cf6716c8ed..2465d6d35b06 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); |