OSDN Git Service
(root)
/
uclinux-h8
/
linux.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
(from parent 1:
ad81f05
)
Merge remote-tracking branch 'spi/fix/s3c64xx' into spi-linus
author
Mark Brown
<broonie@linaro.org>
Mon, 15 Jul 2013 10:46:14 +0000
(11:46 +0100)
committer
Mark Brown
<broonie@linaro.org>
Mon, 15 Jul 2013 10:46:14 +0000
(11:46 +0100)
drivers/spi/spi-s3c64xx.c
patch
|
blob
|
history
diff --git
a/drivers/spi/spi-s3c64xx.c
b/drivers/spi/spi-s3c64xx.c
index
eb53df2
..
63e2070
100644
(file)
--- 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);