| Message ID | 20240125205312.3458541-2-dlechner@baylibre.com |
|---|---|
| State | New |
| Headers | show |
| Series | spi: fix finalize message on error return | expand |
diff --git a/drivers/spi/spi.c b/drivers/spi/spi.c index 7a70ef47cdf6..4dea33ca50b9 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; } }
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> --- Context: I just noticed that this was missing while looking at the code, so I didn't actually hit the error path here. Also, technically the bug probably existed before the Fixes commit but that change did some refactoring and moved that particular chunk of code, so that is the oldest commit where this patch will apply cleanly. drivers/spi/spi.c | 4 ++++ 1 file changed, 4 insertions(+)