Commit e120cc0d authored Jan 05, 2014 by Daniel Santos Committed by Mark Brown Jan 06, 2014

spidev: fix hang when transfer_one_message fails



This corrects a problem in spi_pump_messages() that leads to an spi
message hanging forever when a call to transfer_one_message() fails.
This failure occurs in my MCP2210 driver when the cs_change bit is set
on the last transfer in a message, an operation which the hardware does
not support.

Rationale
Since the transfer_one_message() returns an int, we must presume that it
may fail.  If transfer_one_message() should never fail, it should return
void.  Thus, calls to transfer_one_message() should properly manage a
failure.

Fixes: ffbbdd21 (spi: create a message queueing infrastructure)
Signed-off-by: Daniel Santos <daniel.santos@pobox.com>
Signed-off-by: Mark Brown <broonie@linaro.org>
Cc: stable@vger.kernel.org

parent 6ce4eac1

drivers/spi/spi.c

+3 −1

Original line number	Diff line number	Diff line
		@@ -735,7 +735,9 @@ static void spi_pump_messages(struct kthread_work *work)
		ret = master->transfer_one_message(master, master->cur_msg);
		if (ret) {
		dev_err(&master->dev,
		"failed to transfer one message from queue\n");
		"failed to transfer one message from queue: %d\n", ret);
		master->cur_msg->status = ret;
		spi_finalize_current_message(master);
		return;
		}
		}

Admin message