diff options
| author | David Lechner <dlechner@baylibre.com> | 2024-01-25 21:53:09 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2024-01-25 22:55:48 +0100 |
| commit | 8c2ae772fe08e33f3d7a83849e85539320701abd (patch) | |
| tree | 557810416e4652e88301b39db19fe74204b7a6e8 /drivers/spi/spi.c | |
| parent | spi: cs42l43: Handle error from devm_pm_runtime_enable (diff) | |
| download | linux-8c2ae772fe08e33f3d7a83849e85539320701abd.tar.xz linux-8c2ae772fe08e33f3d7a83849e85539320701abd.zip | |
spi: fix finalize message on error return
In __spi_pump_transfer_message(), the message was not finalized in the
first error return as it is in the other error return paths. Not
finalizing the message could cause anything waiting on the message to
complete to hang forever.
This adds the missing call to spi_finalize_current_message().
Fixes: ae7d2346dc89 ("spi: Don't use the message queue if possible in spi_sync")
Signed-off-by: David Lechner <dlechner@baylibre.com>
Link: https://msgid.link/r/20240125205312.3458541-2-dlechner@baylibre.com
Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to '')
| -rw-r--r-- | drivers/spi/spi.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/spi/spi.c b/drivers/spi/spi.c index 7477a11e12be..f2170f4b5077 100644 --- a/drivers/spi/spi.c +++ b/drivers/spi/spi.c @@ -1717,6 +1717,10 @@ static int __spi_pump_transfer_message(struct spi_controller *ctlr, pm_runtime_put_noidle(ctlr->dev.parent); dev_err(&ctlr->dev, "Failed to power device: %d\n", ret); + + msg->status = ret; + spi_finalize_current_message(ctlr); + return ret; } } |