Patch "spi: tegra210-quad: Fix iterator outside loop" has been added to the 6.1-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 iterator outside loop

to the 6.1-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-iterator-outside-loop.patch
and it can be found in the queue-6.1 subdirectory.

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



commit 48f8419108eee9c736b2155062820bbdb9d17653
Author: Krishna Yarlagadda <kyarlagadda@xxxxxxxxxx>
Date:   Tue Feb 28 01:34:28 2023 +0530

    spi: tegra210-quad: Fix iterator outside loop
    
    [ Upstream commit 2449d436681d40bc63ec2c766fd51b632270d8a7 ]
    
    Fix warn: iterator used outside loop: 'xfer'. 'xfer' variable contain
    invalid value in few conditions. Complete transfer within DATA phase
    in successful case and at the end for failed transfer.
    
    Reported-by: Dan Carpenter <dan.carpenter@xxxxxxxxxx>
    Link:https://lore.kernel.org/all/202210191211.46FkzKmv-lkp@xxxxxxxxx/
    Fixes: 8777dd9dff40 ("spi: tegra210-quad: Fix combined sequence")
    
    Signed-off-by: Krishna Yarlagadda <kyarlagadda@xxxxxxxxxx>
    Link: https://lore.kernel.org/r/20230227200428.45832-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 6498948e150a5..06c54d49076ae 100644
--- a/drivers/spi/spi-tegra210-quad.c
+++ b/drivers/spi/spi-tegra210-quad.c
@@ -1156,6 +1156,10 @@ static int tegra_qspi_combined_seq_xfer(struct tegra_qspi *tqspi,
 				ret = -EIO;
 				goto exit;
 			}
+			if (!xfer->cs_change) {
+				tegra_qspi_transfer_end(spi);
+				spi_transfer_delay_exec(xfer);
+			}
 			break;
 		default:
 			ret = -EINVAL;
@@ -1164,14 +1168,14 @@ 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;
+	if (ret < 0) {
+		tegra_qspi_transfer_end(spi);
+		spi_transfer_delay_exec(xfer);
+	}
 
 	return ret;
 }