summaryrefslogtreecommitdiff
path: root/drivers/spi
diff options
context:
space:
mode:
authorMark Brown <broonie@linaro.org>2014-02-11 12:08:26 +0000
committerMark Brown <broonie@linaro.org>2014-02-11 12:08:26 +0000
commit797d0dec8aab6b3a3ac22eaa27ea298bf4ab37e4 (patch)
tree5f5149e281ebfa77dd83108155fae90f30c2ebce /drivers/spi
parentb28a960c42fcd9cfc987441fa6d1c1a471f0f9ed (diff)
parent1f802f8249a0da536877842c43c7204064c4de8b (diff)
Merge remote-tracking branch 'spi/fix/core' into spi-linus
Diffstat (limited to 'drivers/spi')
-rw-r--r--drivers/spi/spi.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/spi/spi.c b/drivers/spi/spi.c
index 23756b0f9036..d0b28bba38be 100644
--- a/drivers/spi/spi.c
+++ b/drivers/spi/spi.c
@@ -755,9 +755,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;
}
}