]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
spi: pl022: Fix incorrect dma_unmap_sg
authorRay Jui <rjui@broadcom.com>
Thu, 9 Oct 2014 18:44:54 +0000 (11:44 -0700)
committerZefan Li <lizefan@huawei.com>
Mon, 2 Feb 2015 09:05:00 +0000 (17:05 +0800)
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: Zefan Li <lizefan@huawei.com>
drivers/spi/spi-pl022.c

index 469eb28e8328ccea9c98e22118b89e405db3598e..e3b845ae93c6aa28c5f51bfbb9de69dd5b437b91 100644 (file)
@@ -1061,7 +1061,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: