Skip to content

Commit 069e157

Browse files
committed
Merge remote-tracking branch 'spi/fix/s3c64xx' into spi-linus
2 parents ad81f05 + d96760f commit 069e157

File tree

1 file changed

+3
-0
lines changed

1 file changed

+3
-0
lines changed

drivers/spi/spi-s3c64xx.c

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -434,6 +434,9 @@ static int s3c64xx_spi_prepare_transfer(struct spi_master *spi)
434434
dma_cap_mask_t mask;
435435
int ret;
436436

437+
if (is_polling(sdd))
438+
return 0;
439+
437440
dma_cap_zero(mask);
438441
dma_cap_set(DMA_SLAVE, mask);
439442

0 commit comments

Comments
 (0)