| From 7ff378589460524f39295d4f3155d92cadb9c526 Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Wed, 22 May 2019 11:00:36 +0000 |
| Subject: spi: spi-fsl-spi: call spi_finalize_current_message() at the end |
| |
| From: Christophe Leroy <christophe.leroy@c-s.fr> |
| |
| [ Upstream commit 44a042182cb1e9f7916e015c836967bf638b33c4 ] |
| |
| spi_finalize_current_message() shall be called once all |
| actions are finished, otherwise the last actions might |
| step over a newly started transfer. |
| |
| Fixes: c592becbe704 ("spi: fsl-(e)spi: migrate to generic master queueing") |
| Signed-off-by: Christophe Leroy <christophe.leroy@c-s.fr> |
| Signed-off-by: Mark Brown <broonie@kernel.org> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| drivers/spi/spi-fsl-spi.c | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| diff --git a/drivers/spi/spi-fsl-spi.c b/drivers/spi/spi-fsl-spi.c |
| index 8b290d9d79350..5419de19859a0 100644 |
| --- a/drivers/spi/spi-fsl-spi.c |
| +++ b/drivers/spi/spi-fsl-spi.c |
| @@ -408,7 +408,6 @@ static int fsl_spi_do_one_msg(struct spi_master *master, |
| } |
| |
| m->status = status; |
| - spi_finalize_current_message(master); |
| |
| if (status || !cs_change) { |
| ndelay(nsecs); |
| @@ -416,6 +415,7 @@ static int fsl_spi_do_one_msg(struct spi_master *master, |
| } |
| |
| fsl_spi_setup_transfer(spi, NULL); |
| + spi_finalize_current_message(master); |
| return 0; |
| } |
| |
| -- |
| 2.20.1 |
| |
