diff options
| author |   David Jander <david@protonic.nl> | 2022-09-01 14:36:30 +0200 |
|---|---|---|
| committer |   Mark Brown <broonie@kernel.org> | 2022-09-02 13:27:48 +0100 |
| commit | 9c9c9da7aa108e6bf952c18289527a5234e4fc59 (patch) | |
| tree | d085075fb36e63922946ef1140526a7ff4edfd2c /drivers/spi/spi.c | |
| parent | spi: mux: Fix mux interaction with fast path optimisations (diff) | |
| download | linux-dev-9c9c9da7aa108e6bf952c18289527a5234e4fc59.tar.xz linux-dev-9c9c9da7aa108e6bf952c18289527a5234e4fc59.zip | |
spi: spi: Fix queue hang if previous transfer failed
The queue worker always needs to be kicked one final time after a transfer
is done in order to transition to idle (ctlr->busy = false).
Commit 69fa95905d40 ("spi: Ensure the io_mutex is held until
spi_finalize_current_message()") moved this code into
__spi_pump_messages(), but it was executed only if the transfer was
successful. This condition check causes ctlr-busy to stay true in case of
a failed transfer.
This in turn causes that no new work is ever scheduled to the work queue.
Fixes: 69fa95905d40 ("spi: Ensure the io_mutex is held until spi_finalize_current_message()")
Reported-by: Vincent Whitchurch <vincent.whitchurch@axis.com>
Signed-off-by: David Jander <david@protonic.nl>
Link: https://lore.kernel.org/r/20220901123630.1098433-1-david@protonic.nl
Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'drivers/spi/spi.c')
| -rw-r--r-- | drivers/spi/spi.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/spi/spi.c b/drivers/spi/spi.c index 5cbe090f7676..f7852c2c186c 100644 --- a/drivers/spi/spi.c +++ b/drivers/spi/spi.c @@ -1727,8 +1727,7 @@ static void __spi_pump_messages(struct spi_controller *ctlr, bool in_kthread) spin_unlock_irqrestore(&ctlr->queue_lock, flags); ret = __spi_pump_transfer_message(ctlr, msg, was_busy); - if (!ret) - kthread_queue_work(ctlr->kworker, &ctlr->pump_messages); + kthread_queue_work(ctlr->kworker, &ctlr->pump_messages); ctlr->cur_msg = NULL; ctlr->fallback = false; |