diff options
| author | Girish K S <girishks2000@gmail.com> | 2013-06-27 12:26:53 +0530 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-07-02 19:02:14 +0100 |
| commit | d96760f98e8eb9d35a2eace586d8b93b0e58cbd5 (patch) | |
| tree | a37e9bbb4340fcfce8a8d523706d72d743f17678 /drivers/spi | |
| parent | ed893559c9799df3b32051871c22017151394d82 (diff) | |
| download | linux-d96760f98e8eb9d35a2eace586d8b93b0e58cbd5.tar.gz linux-d96760f98e8eb9d35a2eace586d8b93b0e58cbd5.tar.xz | |
spi: s3c64xx: add missing check for polling mode
After the patch "spi/s3c64xx: Fix non-dmaengine usage"
with commit id 563b444e33810f3120838620c990480304e24e63
submitted by Mark Brown, the spi device detection in polling
mode breaks. This revealed the missing check for polling during
dma prepare. This patch adds the missing check.
Signed-off-by: Girish K S <ks.giri@samsung.com>
Signed-off-by: Mark Brown <broonie@linaro.org>
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 eb53df27e7ea..63e2070c6c14 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); |