diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2014-03-04 15:58:00 +0100 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2014-03-04 15:58:00 +0100 |
| commit | 1c2af4968ea533e875d7cf8d095c084f18164f5d (patch) | |
| tree | f8bb9989ff0a770a1324ed3a44acace3c35de63d /drivers/spi/spi.c | |
| parent | a2fa301fddfcb614568a74317fe9b935dd980045 (diff) | |
| parent | 56041bf920d2937b7cadcb30cb206f0372eee814 (diff) | |
Merge tag 'kvm-for-3.15-1' of git://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms into kvm-next
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 23756b0f903..d0b28bba38b 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; } } |