]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
mmc: bcm2835: Fix dma_unmap_sg() nents value
authorThomas Fourier <fourier.thomas@gmail.com>
Mon, 30 Jun 2025 09:35:07 +0000 (11:35 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 28 Aug 2025 14:22:27 +0000 (16:22 +0200)
commit ff09b71bf9daeca4f21d6e5e449641c9fad75b53 upstream.

The dma_unmap_sg() functions should be called with the same nents as the
dma_map_sg(), not the value the map function returned.

Fixes: 2f5da678351f ("mmc: bcm2835: Properly handle dmaengine_prep_slave_sg")
Signed-off-by: Thomas Fourier <fourier.thomas@gmail.com>
Cc: stable@vger.kernel.org
Link: https://lore.kernel.org/r/20250630093510.82871-2-fourier.thomas@gmail.com
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/mmc/host/bcm2835.c

index 985079943be76497560954207378e44ea826d7f6..f9d1e7bba2c8b216467b3083e5369497a468cc63 100644 (file)
@@ -507,7 +507,8 @@ void bcm2835_prepare_dma(struct bcm2835_host *host, struct mmc_data *data)
                                       DMA_PREP_INTERRUPT | DMA_CTRL_ACK);
 
        if (!desc) {
-               dma_unmap_sg(dma_chan->device->dev, data->sg, sg_len, dir_data);
+               dma_unmap_sg(dma_chan->device->dev, data->sg, data->sg_len,
+                            dir_data);
                return;
        }