Commit 1f802f82 authored Jan 28, 2014 by Geert Uytterhoeven Committed by Mark Brown Jan 28, 2014

spi: Fix crash with double message finalisation on error handling



This reverts commit e120cc0d.

It causes a NULL pointer dereference with drivers using the generic
spi_transfer_one_message(), which always calls
spi_finalize_current_message(), which zeroes master->cur_msg.

Drivers implementing transfer_one_message() theirselves must always call
spi_finalize_current_message(), even if the transfer failed:

 * @transfer_one_message: the subsystem calls the driver to transfer a single
 *      message while queuing transfers that arrive in the meantime. When the
 *      driver is finished with this message, it must call
 *      spi_finalize_current_message() so the subsystem can issue the next
 *      transfer

Signed-off-by: Geert Uytterhoeven <geert+renesas@linux-m68k.org>
Signed-off-by: Mark Brown <broonie@linaro.org>

parent 8b8b773e

drivers/spi/spi.c

+1 −3

Original line number	Diff line number	Diff line
		@@ -745,9 +745,7 @@ 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: %d\n", ret);
		master->cur_msg->status = ret;
		spi_finalize_current_message(master);
		"failed to transfer one message from queue\n");
		return;
		}
		}

Admin message