diff options
| author | Mark Brown <broonie@linaro.org> | 2014-02-14 12:15:57 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2014-02-14 12:15:57 +0000 |
| commit | 6a7fe00e1f5a2e77b777b6e3b90c924c95bfa866 (patch) | |
| tree | 1446c710e4a76d79fe11b1fa01ccb508f0d12d67 /drivers/spi | |
| parent | ccf1801b089f5575144c4346e4d7d3883a6c9163 (diff) | |
| parent | 8415e604452966f981f20cb4d8a8a30e38a772dd (diff) | |
Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-androidlinux-linaro-lsk-v3.10-androidlinux-linaro-lsk-android
Diffstat (limited to 'drivers/spi')
| -rw-r--r-- | drivers/spi/spi-bcm63xx.c | 2 | ||||
| -rw-r--r-- | drivers/spi/spi.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/drivers/spi/spi-bcm63xx.c b/drivers/spi/spi-bcm63xx.c index a4ec5f4ec81..cd716f4cd37 100644 --- a/drivers/spi/spi-bcm63xx.c +++ b/drivers/spi/spi-bcm63xx.c @@ -180,8 +180,6 @@ static int bcm63xx_txrx_bufs(struct spi_device *spi, struct spi_transfer *first, transfer_list); } - len -= prepend_len; - init_completion(&bs->done); /* Fill in the Message control register */ diff --git a/drivers/spi/spi.c b/drivers/spi/spi.c index 32b7bb111eb..ca99ac9295c 100644 --- a/drivers/spi/spi.c +++ b/drivers/spi/spi.c @@ -584,7 +584,9 @@ 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\n"); + "failed to transfer one message from queue: %d\n", ret); + master->cur_msg->status = ret; + spi_finalize_current_message(master); return; } } |