projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'mvebu-defconfig-3.17-2' of git://git.infradead.org/linux-mvebu into next...
[cascardo/linux.git]
/
drivers
/
spi
/
spi-pxa2xx-dma.c
diff --git
a/drivers/spi/spi-pxa2xx-dma.c
b/drivers/spi/spi-pxa2xx-dma.c
index
f6759dc
..
c41ff14
100644
(file)
--- a/
drivers/spi/spi-pxa2xx-dma.c
+++ b/
drivers/spi/spi-pxa2xx-dma.c
@@
-368,7
+368,7
@@
int pxa2xx_spi_set_dma_burst_and_threshold(struct chip_data *chip,
* otherwise we use the default. Also we use the default FIFO
* thresholds for now.
*/
* otherwise we use the default. Also we use the default FIFO
* thresholds for now.
*/
- *burst_code = chip_info ? chip_info->dma_burst_size : 1
6
;
+ *burst_code = chip_info ? chip_info->dma_burst_size : 1;
*threshold = SSCR1_RxTresh(RX_THRESH_DFLT)
| SSCR1_TxTresh(TX_THRESH_DFLT);
*threshold = SSCR1_RxTresh(RX_THRESH_DFLT)
| SSCR1_TxTresh(TX_THRESH_DFLT);