summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorRay Jui <rjui@broadcom.com>2014-10-09 18:44:54 (GMT)
committerMark Brown <broonie@kernel.org>2014-10-13 11:08:35 (GMT)
commit3ffa6158f002e096d28ede71be4e0ee8ab20baa2 (patch)
treed328e378352346d16c45a9bb7b070da9f70b84d8 /drivers
parenta2285b8c75bf7e21895f7c2cf75d6a910914517b (diff)
downloadlinux-3ffa6158f002e096d28ede71be4e0ee8ab20baa2.tar.xz
spi: pl022: Fix incorrect dma_unmap_sg
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> Cc: stable@vger.kernel.org
Diffstat (limited to 'drivers')
-rw-r--r--drivers/spi/spi-pl022.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/spi/spi-pl022.c b/drivers/spi/spi-pl022.c
index f35f723..fc2dd84 100644
--- a/drivers/spi/spi-pl022.c
+++ b/drivers/spi/spi-pl022.c
@@ -1106,7 +1106,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: