diff options
| author | Ray Jui <rjui@broadcom.com> | 2014-10-09 11:44:54 -0700 |
|---|---|---|
| committer | Ben Hutchings <ben@decadent.org.uk> | 2014-12-14 16:23:48 +0000 |
| commit | 5881da41756f21f9a70440ae1cbfd6c9473c9da3 (patch) | |
| tree | 116f5ac8fdf4e54aac7fe52f792ffa127a66211e /drivers/spi | |
| parent | 1ec4a6e216f8b1b4481fd5e3b399de243737002b (diff) | |
| download | kernel_samsung_smdk4412-5881da41756f21f9a70440ae1cbfd6c9473c9da3.zip kernel_samsung_smdk4412-5881da41756f21f9a70440ae1cbfd6c9473c9da3.tar.gz kernel_samsung_smdk4412-5881da41756f21f9a70440ae1cbfd6c9473c9da3.tar.bz2 | |
spi: pl022: Fix incorrect dma_unmap_sg
commit 3ffa6158f002e096d28ede71be4e0ee8ab20baa2 upstream.
When mapped RX DMA entries are unmapped in an error condition when DMA
is firstly configured in the driver, the number of TX DMA entries was
passed in, which is incorrect
Signed-off-by: Ray Jui <rjui@broadcom.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Diffstat (limited to 'drivers/spi')
| -rw-r--r-- | drivers/spi/spi-pl022.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/spi/spi-pl022.c b/drivers/spi/spi-pl022.c index 5559b22..62b21ca 100644 --- a/drivers/spi/spi-pl022.c +++ b/drivers/spi/spi-pl022.c @@ -1078,7 +1078,7 @@ err_rxdesc: pl022->sgt_tx.nents, DMA_TO_DEVICE); err_tx_sgmap: dma_unmap_sg(rxchan->device->dev, pl022->sgt_rx.sgl, - pl022->sgt_tx.nents, DMA_FROM_DEVICE); + pl022->sgt_rx.nents, DMA_FROM_DEVICE); err_rx_sgmap: sg_free_table(&pl022->sgt_tx); err_alloc_tx_sg: |