summaryrefslogtreecommitdiff
path: root/drivers/spi/spi-mt65xx.c
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2018-11-06 19:08:00 +0000
committerMark Brown <broonie@kernel.org>2018-11-06 19:08:00 +0000
commite28ae34e51bd2799aa4fdc80053db6cf1d165641 (patch)
treea3a2b68a9251d4a884d3304b0d19679abfe161a6 /drivers/spi/spi-mt65xx.c
parent326e5c8d4a87512ee329efc1b45029767ec710bb (diff)
parenta4d8f64f7267a88d4688f5c216926f5f6cafbae6 (diff)
Merge branch 'spi-4.20' into spi-4.21 for uniphier DT
Diffstat (limited to 'drivers/spi/spi-mt65xx.c')
-rw-r--r--drivers/spi/spi-mt65xx.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/spi/spi-mt65xx.c b/drivers/spi/spi-mt65xx.c
index f3119d82150e..9ee1fe968a2d 100644
--- a/drivers/spi/spi-mt65xx.c
+++ b/drivers/spi/spi-mt65xx.c
@@ -531,11 +531,11 @@ static irqreturn_t mtk_spi_interrupt(int irq, void *dev_id)
mdata->xfer_len = min(MTK_SPI_MAX_FIFO_SIZE, len);
mtk_spi_setup_packet(master);
- cnt = len / 4;
+ cnt = mdata->xfer_len / 4;
iowrite32_rep(mdata->base + SPI_TX_DATA_REG,
trans->tx_buf + mdata->num_xfered, cnt);
- remainder = len % 4;
+ remainder = mdata->xfer_len % 4;
if (remainder > 0) {
reg_val = 0;
memcpy(&reg_val,