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

This commit is contained in:
Mark Brown 2014-02-11 12:08:26 +00:00
commit 797d0dec8a

View file

@ -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;
} }
} }