Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 797d0dec authored by Mark Brown's avatar Mark Brown
Browse files

Merge remote-tracking branch 'spi/fix/core' into spi-linus

parents b28a960c 1f802f82

drivers/spi/spi.c

+1 −3
Original line number Original line Diff line number Diff line
@@ -755,9 +755,7 @@ static void spi_pump_messages(struct kthread_work *work) 
	ret = master->transfer_one_message(master, master->cur_msg);

	ret = master->transfer_one_message(master, master->cur_msg);

	if (ret) {

	if (ret) {

		dev_err(&master->dev,

		dev_err(&master->dev,

			"failed to transfer one message from queue: %d\n", ret);

			"failed to transfer one message from queue\n");

		master->cur_msg->status = ret;

		spi_finalize_current_message(master);

		return;

		return;

	}

	}

}

}