]> 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)
committerJiri Slaby <jslaby@suse.cz>
Thu, 13 Nov 2014 18:02:48 +0000 (19:02 +0100)
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: Jiri Slaby <jslaby@suse.cz>
drivers/spi/spi-pl022.c

index 9c511a954d213cfec829ebcc0431b80cf93541f9..b1a9ba893fabc3cba13261c4e5b2c5096ab655fb 100644 (file)
@@ -1075,7 +1075,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: