Patch "spi: tegra210-quad: Fix combined sequence" has been added to the 6.0-stable tree

[Sasha Levin <sashal@xxxxxxxxxx>]

This is a note to let you know that I've just added the patch titled

    spi: tegra210-quad: Fix combined sequence

to the 6.0-stable tree which can be found at:
    http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
     spi-tegra210-quad-fix-combined-sequence.patch
and it can be found in the queue-6.0 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.



commit ae45309444960beb1ddb0d537aeabd8f59525cf7
Author: Krishna Yarlagadda <kyarlagadda@xxxxxxxxxx>
Date:   Sat Oct 1 17:51:44 2022 +0530

    spi: tegra210-quad: Fix combined sequence
    
    [ Upstream commit 8777dd9dff4020bba66654ec92e4b0ab6367ad30 ]
    
    Return value should be updated to zero in combined sequence routine
    if transfer is completed successfully. Currently it holds timeout value
    resulting in errors.
    
    Signed-off-by: Krishna Yarlagadda <kyarlagadda@xxxxxxxxxx>
    Link: https://lore.kernel.org/r/20221001122148.9158-1-kyarlagadda@xxxxxxxxxx
    Signed-off-by: Mark Brown <broonie@xxxxxxxxxx>
    Signed-off-by: Sasha Levin <sashal@xxxxxxxxxx>

diff --git a/drivers/spi/spi-tegra210-quad.c b/drivers/spi/spi-tegra210-quad.c
index c89592b21ffc..904972606bd4 100644
--- a/drivers/spi/spi-tegra210-quad.c
+++ b/drivers/spi/spi-tegra210-quad.c
@@ -1157,6 +1157,11 @@ static int tegra_qspi_combined_seq_xfer(struct tegra_qspi *tqspi,
 		msg->actual_length += xfer->len;
 		transfer_phase++;
 	}
+	if (!xfer->cs_change) {
+		tegra_qspi_transfer_end(spi);
+		spi_transfer_delay_exec(xfer);
+	}
+	ret = 0;
 
 exit:
 	msg->status = ret;