lkml.org 
[lkml]   [2020]   [Oct]   [27]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.9 216/757] staging: emxx_udc: Fix passing of NULL to dma_alloc_coherent()
    Date
    From: Alex Dewar <alex.dewar90@gmail.com>

    [ Upstream commit cc34073c6248e9cec801bf690d1455f264d12357 ]

    In nbu2ss_eq_queue() memory is allocated with dma_alloc_coherent(),
    though, strangely, NULL is passed as the struct device* argument. Pass
    the UDC's device instead. Fix up the corresponding call to
    dma_free_coherent() in the same way.

    Build-tested on x86 only.

    Fixes: 33aa8d45a4fe ("staging: emxx_udc: Add Emma Mobile USB Gadget driver")
    Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
    Signed-off-by: Alex Dewar <alex.dewar90@gmail.com>
    Link: https://lore.kernel.org/r/20200825091928.55794-1-alex.dewar90@gmail.com
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/staging/emxx_udc/emxx_udc.c | 4 ++--
    1 file changed, 2 insertions(+), 2 deletions(-)

    diff --git a/drivers/staging/emxx_udc/emxx_udc.c b/drivers/staging/emxx_udc/emxx_udc.c
    index 03929b9d3a8bc..d0725bc8b48a4 100644
    --- a/drivers/staging/emxx_udc/emxx_udc.c
    +++ b/drivers/staging/emxx_udc/emxx_udc.c
    @@ -2593,7 +2593,7 @@ static int nbu2ss_ep_queue(struct usb_ep *_ep,

    if (req->unaligned) {
    if (!ep->virt_buf)
    - ep->virt_buf = dma_alloc_coherent(NULL, PAGE_SIZE,
    + ep->virt_buf = dma_alloc_coherent(udc->dev, PAGE_SIZE,
    &ep->phys_buf,
    GFP_ATOMIC | GFP_DMA);
    if (ep->epnum > 0) {
    @@ -3148,7 +3148,7 @@ static int nbu2ss_drv_remove(struct platform_device *pdev)
    for (i = 0; i < NUM_ENDPOINTS; i++) {
    ep = &udc->ep[i];
    if (ep->virt_buf)
    - dma_free_coherent(NULL, PAGE_SIZE, (void *)ep->virt_buf,
    + dma_free_coherent(udc->dev, PAGE_SIZE, (void *)ep->virt_buf,
    ep->phys_buf);
    }

    --
    2.25.1


    \
     
     \ /
      Last update: 2020-10-27 17:10    [W:4.207 / U:0.020 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site