diff options
| author | Jakub Kicinski <kuba@kernel.org> | 2021-09-23 20:19:49 +0200 |
|---|---|---|
| committer | Jakub Kicinski <kuba@kernel.org> | 2021-09-23 20:19:49 +0200 |
| commit | 2fcd14d0f78090f57aecd7f424e2b0373cd631a7 (patch) | |
| tree | f8946c307a3b5d319c17ec988d8a38c0fe7a08de /drivers/spi/spi-rockchip.c | |
| parent | net: dsa: sja1105: stop using priv->vlan_aware (diff) | |
| parent | Merge tag 'net-5.15-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/net... (diff) | |
| download | linux-2fcd14d0f78090f57aecd7f424e2b0373cd631a7.tar.xz linux-2fcd14d0f78090f57aecd7f424e2b0373cd631a7.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
net/mptcp/protocol.c
977d293e23b4 ("mptcp: ensure tx skbs always have the MPTCP ext")
efe686ffce01 ("mptcp: ensure tx skbs always have the MPTCP ext")
same patch merged in both trees, keep net-next.
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'drivers/spi/spi-rockchip.c')
| -rw-r--r-- | drivers/spi/spi-rockchip.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/spi/spi-rockchip.c b/drivers/spi/spi-rockchip.c index 540861ca2ba3..553b6b9d0222 100644 --- a/drivers/spi/spi-rockchip.c +++ b/drivers/spi/spi-rockchip.c @@ -600,6 +600,12 @@ static int rockchip_spi_transfer_one( int ret; bool use_dma; + /* Zero length transfers won't trigger an interrupt on completion */ + if (!xfer->len) { + spi_finalize_current_transfer(ctlr); + return 1; + } + WARN_ON(readl_relaxed(rs->regs + ROCKCHIP_SPI_SSIENR) && (readl_relaxed(rs->regs + ROCKCHIP_SPI_SR) & SR_BUSY)); |