Commit d57e7960 authored by Mark Brown's avatar Mark Brown

spi: Fix core transfer waits after slave support

The refactoring done as part of adding the core support for handling
waiting for slave transfer dropped a conditional which meant that we
started waiting for completion of all transfers, not just those that the
controller asked for.  This caused hangs and massive delays on platforms
that don't need the core delay.  Re-add the delay to fix this.

Fixes: 810923f3 (spi: Deal with slaves that return from transfer_one() unfinished)
Reported-by: default avatarTony Lindgren <tony@atomide.com>
Tested-by: default avatarTony Lindgren <tony@atomide.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 7986e227
...@@ -1114,9 +1114,11 @@ static int spi_transfer_one_message(struct spi_controller *ctlr, ...@@ -1114,9 +1114,11 @@ static int spi_transfer_one_message(struct spi_controller *ctlr,
goto out; goto out;
} }
ret = spi_transfer_wait(ctlr, msg, xfer); if (ret > 0) {
if (ret < 0) ret = spi_transfer_wait(ctlr, msg, xfer);
msg->status = ret; if (ret < 0)
msg->status = ret;
}
} else { } else {
if (xfer->len) if (xfer->len)
dev_err(&msg->spi->dev, dev_err(&msg->spi->dev,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment