Skip to content

Commit

Permalink
spi: s3c64xx: add missing check for polling mode
Browse files Browse the repository at this point in the history
After the patch "spi/s3c64xx: Fix non-dmaengine usage"
with commit id 563b444
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>
  • Loading branch information
Girish K S authored and Mark Brown committed Jul 2, 2013
1 parent ed89355 commit d96760f
Showing 1 changed file with 3 additions and 0 deletions.
3 changes: 3 additions & 0 deletions drivers/spi/spi-s3c64xx.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down

0 comments on commit d96760f

Please sign in to comment.