diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-10-29 16:44:40 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-10-29 16:44:40 +0100 |
| commit | e64de3b96c1ba3c1de236a4a103ec21234a5849f (patch) | |
| tree | b4ed91858a3d353bd72e3be101433ac821759379 /drivers/spi/spi-mxs.c | |
| parent | w1/ds2482: use module_i2c_driver to simplify the code (diff) | |
| parent | Linux 3.7-rc3 (diff) | |
| download | linux-e64de3b96c1ba3c1de236a4a103ec21234a5849f.tar.xz linux-e64de3b96c1ba3c1de236a4a103ec21234a5849f.zip | |
Merge 3.7-rc3 into char-misc-next
This brings in the various 3.7-rc3 char fixes into char-misc-next.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/spi/spi-mxs.c')
| -rw-r--r-- | drivers/spi/spi-mxs.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/spi/spi-mxs.c b/drivers/spi/spi-mxs.c index edf1360ab09e..86dd04d6bc87 100644 --- a/drivers/spi/spi-mxs.c +++ b/drivers/spi/spi-mxs.c @@ -323,6 +323,7 @@ static int mxs_spi_txrx_dma(struct mxs_spi *spi, int cs, if (!ret) { dev_err(ssp->dev, "DMA transfer timeout\n"); ret = -ETIMEDOUT; + dmaengine_terminate_all(ssp->dmach); goto err_vmalloc; } @@ -480,7 +481,7 @@ static int mxs_spi_transfer_one(struct spi_master *master, first = last = 0; } - m->status = 0; + m->status = status; spi_finalize_current_message(master); return status; |