diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2014-06-17 14:20:17 -1000 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-06-17 14:20:17 -1000 |
| commit | 66a521bdda5681db255d4ce323c0de1a30e08f04 (patch) | |
| tree | 3eab174ea03428c335f40ed722c748eeb118fc9b | |
| parent | epoll: fix use-after-free in eventpoll_release_file (diff) | |
| parent | spi/pxa2xx: change default supported DMA burst size to 1 (diff) | |
| download | linux-rng-66a521bdda5681db255d4ce323c0de1a30e08f04.tar.xz linux-rng-66a521bdda5681db255d4ce323c0de1a30e08f04.zip | |
Merge tag 'spi-v3.16-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi
Pull spi fix from Mark Brown:
"A single bugfix from the merge window, fixing an issue with DMA at
slow speeds on Intel hardware"
* tag 'spi-v3.16-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi:
spi/pxa2xx: change default supported DMA burst size to 1
| -rw-r--r-- | drivers/spi/spi-pxa2xx-dma.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/spi/spi-pxa2xx-dma.c b/drivers/spi/spi-pxa2xx-dma.c index f6759dc0153b..c41ff148a2b4 100644 --- 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. */ - *burst_code = chip_info ? chip_info->dma_burst_size : 16; + *burst_code = chip_info ? chip_info->dma_burst_size : 1; *threshold = SSCR1_RxTresh(RX_THRESH_DFLT) | SSCR1_TxTresh(TX_THRESH_DFLT); |