diff options
| author | Ray Jui <rjui@broadcom.com> | 2014-10-09 11:44:54 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-11-14 08:47:59 -0800 |
| commit | a8be23c660a778cdab39bcde9cd3696ebc097f6f (patch) | |
| tree | ab54e3ebff2e3dd8f3215c38f683c4fbaca68578 /drivers | |
| parent | 6b93e3669cb10c50dd9441f3eabc63b8d43749d0 (diff) | |
| download | linux-3.10-a8be23c660a778cdab39bcde9cd3696ebc097f6f.tar.gz linux-3.10-a8be23c660a778cdab39bcde9cd3696ebc097f6f.tar.bz2 linux-3.10-a8be23c660a778cdab39bcde9cd3696ebc097f6f.zip | |
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: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers')
| -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 371cc66f1a0..5266c89fc98 100644 --- a/drivers/spi/spi-pl022.c +++ b/drivers/spi/spi-pl022.c @@ -1080,7 +1080,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: |