diff options
| author | Mark Brown <broonie@linaro.org> | 2014-03-06 08:43:51 +0400 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2014-03-06 08:43:51 +0400 |
| commit | e37912fd0bdf174e934af6cfb0002a077867b644 (patch) | |
| tree | c661c8a6e20e013abf4dd5ac27b9a70f218ff290 /drivers/spi/spi.c | |
| parent | 8535736c27cc4e25b9948d857138315f45b6fa34 (diff) | |
| parent | 37f204164dfb0186a0caf20bc3e3120080bcd788 (diff) | |
| download | linux-e37912fd0bdf174e934af6cfb0002a077867b644.tar.xz | |
Merge branch 'pm-drivers' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm into spi-pl022
Diffstat (limited to 'drivers/spi/spi.c')
| -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 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; } } |