diff options
| author | Mark Brown <broonie@linaro.org> | 2014-02-11 12:08:26 (GMT) |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2014-02-11 12:08:26 (GMT) |
| commit | 797d0dec8aab6b3a3ac22eaa27ea298bf4ab37e4 (patch) | |
| tree | 5f5149e281ebfa77dd83108155fae90f30c2ebce | |
| parent | b28a960c42fcd9cfc987441fa6d1c1a471f0f9ed (diff) | |
| parent | 1f802f8249a0da536877842c43c7204064c4de8b (diff) | |
| download | linux-797d0dec8aab6b3a3ac22eaa27ea298bf4ab37e4.tar.xz | |
Merge remote-tracking branch 'spi/fix/core' into spi-linus
| -rw-r--r-- | drivers/spi/spi.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/spi/spi.c b/drivers/spi/spi.c index 23756b0..d0b28bb 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; } } |