lkml.org 
[lkml]   [2021]   [Feb]   [8]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.10 047/120] net: ipa: pass correct dma_handle to dma_free_coherent()
    Date
    From: Dan Carpenter <dan.carpenter@oracle.com>

    [ Upstream commit 4ace7a6e287b7e3b33276cd9fe870c326f880480 ]

    The "ring->addr = addr;" assignment is done a few lines later so we
    can't use "ring->addr" yet. The correct dma_handle is "addr".

    Fixes: 650d1603825d ("soc: qcom: ipa: the generic software interface")
    Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
    Reviewed-by: Alex Elder <elder@linaro.org>
    Link: https://lore.kernel.org/r/YBjpTU2oejkNIULT@mwanda
    Signed-off-by: Jakub Kicinski <kuba@kernel.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/net/ipa/gsi.c | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)

    diff --git a/drivers/net/ipa/gsi.c b/drivers/net/ipa/gsi.c
    index 6bfac1efe037c..4a68da7115d19 100644
    --- a/drivers/net/ipa/gsi.c
    +++ b/drivers/net/ipa/gsi.c
    @@ -1256,7 +1256,7 @@ static int gsi_ring_alloc(struct gsi *gsi, struct gsi_ring *ring, u32 count)
    /* Hardware requires a 2^n ring size, with alignment equal to size */
    ring->virt = dma_alloc_coherent(dev, size, &addr, GFP_KERNEL);
    if (ring->virt && addr % size) {
    - dma_free_coherent(dev, size, ring->virt, ring->addr);
    + dma_free_coherent(dev, size, ring->virt, addr);
    dev_err(dev, "unable to alloc 0x%zx-aligned ring buffer\n",
    size);
    return -EINVAL; /* Not a good error value, but distinct */
    --
    2.27.0


    \
     
     \ /
      Last update: 2021-02-08 18:09    [W:2.434 / U:0.192 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site