summaryrefslogtreecommitdiffstats
path: root/drivers/spi/spi-omap2-mcspi.c
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2019-02-20 12:58:18 -0500
committerMark Brown <broonie@kernel.org>2019-02-20 12:58:18 -0500
commitbf9f742c38c4604a8ee349f7baefca58b3a5ff67 (patch)
treefa4d349e4a843bf5543f6e7ab6e73dce1eda10e9 /drivers/spi/spi-omap2-mcspi.c
parent484a9a68d669f899657a97dbb369cb3e3be7e7f5 (diff)
parentef070b4e4aa25bb5f8632ad196644026c11903bf (diff)
Merge branch 'for-5.0' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi into spi-5.1
Diffstat (limited to 'drivers/spi/spi-omap2-mcspi.c')
-rw-r--r--drivers/spi/spi-omap2-mcspi.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/spi/spi-omap2-mcspi.c b/drivers/spi/spi-omap2-mcspi.c
index 2fd8881fcd65..8be304379628 100644
--- a/drivers/spi/spi-omap2-mcspi.c
+++ b/drivers/spi/spi-omap2-mcspi.c
@@ -623,8 +623,8 @@ omap2_mcspi_txrx_dma(struct spi_device *spi, struct spi_transfer *xfer)
623 cfg.dst_addr = cs->phys + OMAP2_MCSPI_TX0; 623 cfg.dst_addr = cs->phys + OMAP2_MCSPI_TX0;
624 cfg.src_addr_width = width; 624 cfg.src_addr_width = width;
625 cfg.dst_addr_width = width; 625 cfg.dst_addr_width = width;
626 cfg.src_maxburst = es; 626 cfg.src_maxburst = 1;
627 cfg.dst_maxburst = es; 627 cfg.dst_maxburst = 1;
628 628
629 rx = xfer->rx_buf; 629 rx = xfer->rx_buf;
630 tx = xfer->tx_buf; 630 tx = xfer->tx_buf;