diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2014-04-04 03:33:49 +0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2014-04-04 03:33:49 +0400 |
| commit | bce5669be3a8946952258a064ef26defeb887138 (patch) | |
| tree | 117386b9909882c000f822011c5ea6fdcbab3273 /drivers/spi/spi.c | |
| parent | 95959e6a06720834fc80a210e37898341c63cb91 (diff) | |
| parent | 566b60c04ab230b8cc3845f964306f99504b18df (diff) | |
| download | linux-bce5669be3a8946952258a064ef26defeb887138.tar.xz | |
Merge branch 'devel-stable' into for-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 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; } } |