| From 3ffa6158f002e096d28ede71be4e0ee8ab20baa2 Mon Sep 17 00:00:00 2001 |
| From: Ray Jui <rjui@broadcom.com> |
| Date: Thu, 9 Oct 2014 11:44:54 -0700 |
| Subject: spi: pl022: Fix incorrect dma_unmap_sg |
| |
| From: Ray Jui <rjui@broadcom.com> |
| |
| 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> |
| |
| --- |
| drivers/spi/spi-pl022.c | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| --- a/drivers/spi/spi-pl022.c |
| +++ b/drivers/spi/spi-pl022.c |
| @@ -1074,7 +1074,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: |
