From 40b48438999fd6b45cb9bc5607b9ddf63eeba4b4 Mon Sep 17 00:00:00 2001 From: Tao Huang Date: Tue, 7 Feb 2023 20:16:36 +0800 Subject: [PATCH] spi: rockchip: Sync with upstream Signed-off-by: Tao Huang Change-Id: Ia25e81a1ac5dca491ff31bd3557eac61bbd0962e --- drivers/spi/spi-rockchip.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/drivers/spi/spi-rockchip.c b/drivers/spi/spi-rockchip.c index 03ae4ab93fc8..3e2de189d371 100644 --- a/drivers/spi/spi-rockchip.c +++ b/drivers/spi/spi-rockchip.c @@ -601,9 +601,9 @@ static int rockchip_spi_config(struct rockchip_spi *rs, enum rockchip_spi_xfer_mode xfer_mode, bool slave_mode) { u32 cr0 = CR0_FRF_SPI << CR0_FRF_OFFSET - | CR0_BHT_8BIT << CR0_BHT_OFFSET - | CR0_SSD_ONE << CR0_SSD_OFFSET - | CR0_EM_BIG << CR0_EM_OFFSET; + | CR0_BHT_8BIT << CR0_BHT_OFFSET + | CR0_SSD_ONE << CR0_SSD_OFFSET + | CR0_EM_BIG << CR0_EM_OFFSET; u32 cr1; u32 dmacr = 0; @@ -761,7 +761,6 @@ static int rockchip_spi_slave_abort(struct spi_controller *ctlr) *(u16 *)rs->rx = (u16)rxw; rs->rx += rs->n_bytes; } - rs->xfer->len = (unsigned int)(rs->rx - rs->xfer->rx_buf); }