Message ID | 20220601110013.55366-1-linmq006@gmail.com (mailing list archive) |
---|---|
State | Changes Requested |
Headers | show |
Series | [v2] dmaengine: ti: Add missing put_device in ti_dra7_xbar_route_allocate | expand |
On 01/06/2022 14:00, Miaoqian Lin wrote: > of_find_device_by_node() takes reference, we should use put_device() > to release it when not need anymore. adding a new label and using goto would be another option or even better? > Fixes: a074ae38f859 ("dmaengine: Add driver for TI DMA crossbar on DRA7x") > Signed-off-by: Miaoqian Lin <linmq006@gmail.com> > --- > changes in v2: > - split v1 into two patches. > v1 link: > https://lore.kernel.org/r/20220512051815.11946-1-linmq006@gmail.com > --- > drivers/dma/ti/dma-crossbar.c | 4 ++++ > 1 file changed, 4 insertions(+) > > diff --git a/drivers/dma/ti/dma-crossbar.c b/drivers/dma/ti/dma-crossbar.c > index 71d24fc07c00..06da13b18a7b 100644 > --- a/drivers/dma/ti/dma-crossbar.c > +++ b/drivers/dma/ti/dma-crossbar.c > @@ -245,6 +245,7 @@ static void *ti_dra7_xbar_route_allocate(struct of_phandle_args *dma_spec, > if (dma_spec->args[0] >= xbar->xbar_requests) { > dev_err(&pdev->dev, "Invalid XBAR request number: %d\n", > dma_spec->args[0]); > + put_device(&pdev->dev); > return ERR_PTR(-EINVAL); > } > > @@ -252,12 +253,14 @@ static void *ti_dra7_xbar_route_allocate(struct of_phandle_args *dma_spec, > dma_spec->np = of_parse_phandle(ofdma->of_node, "dma-masters", 0); > if (!dma_spec->np) { > dev_err(&pdev->dev, "Can't get DMA master\n"); > + put_device(&pdev->dev); > return ERR_PTR(-EINVAL); > } > > map = kzalloc(sizeof(*map), GFP_KERNEL); > if (!map) { > of_node_put(dma_spec->np); > + put_device(&pdev->dev); > return ERR_PTR(-ENOMEM); > } > > @@ -268,6 +271,7 @@ static void *ti_dra7_xbar_route_allocate(struct of_phandle_args *dma_spec, > mutex_unlock(&xbar->mutex); > dev_err(&pdev->dev, "Run out of free DMA requests\n"); > kfree(map); > + put_device(&pdev->dev); this will not apply with the other patch going separately... Can you send a two patch series? While there, I would check if labels+goto would look better? Thanks for finding these and fixing it! > return ERR_PTR(-ENOMEM); > } > set_bit(map->xbar_out, xbar->dma_inuse);
diff --git a/drivers/dma/ti/dma-crossbar.c b/drivers/dma/ti/dma-crossbar.c index 71d24fc07c00..06da13b18a7b 100644 --- a/drivers/dma/ti/dma-crossbar.c +++ b/drivers/dma/ti/dma-crossbar.c @@ -245,6 +245,7 @@ static void *ti_dra7_xbar_route_allocate(struct of_phandle_args *dma_spec, if (dma_spec->args[0] >= xbar->xbar_requests) { dev_err(&pdev->dev, "Invalid XBAR request number: %d\n", dma_spec->args[0]); + put_device(&pdev->dev); return ERR_PTR(-EINVAL); } @@ -252,12 +253,14 @@ static void *ti_dra7_xbar_route_allocate(struct of_phandle_args *dma_spec, dma_spec->np = of_parse_phandle(ofdma->of_node, "dma-masters", 0); if (!dma_spec->np) { dev_err(&pdev->dev, "Can't get DMA master\n"); + put_device(&pdev->dev); return ERR_PTR(-EINVAL); } map = kzalloc(sizeof(*map), GFP_KERNEL); if (!map) { of_node_put(dma_spec->np); + put_device(&pdev->dev); return ERR_PTR(-ENOMEM); } @@ -268,6 +271,7 @@ static void *ti_dra7_xbar_route_allocate(struct of_phandle_args *dma_spec, mutex_unlock(&xbar->mutex); dev_err(&pdev->dev, "Run out of free DMA requests\n"); kfree(map); + put_device(&pdev->dev); return ERR_PTR(-ENOMEM); } set_bit(map->xbar_out, xbar->dma_inuse);
of_find_device_by_node() takes reference, we should use put_device() to release it when not need anymore. Fixes: a074ae38f859 ("dmaengine: Add driver for TI DMA crossbar on DRA7x") Signed-off-by: Miaoqian Lin <linmq006@gmail.com> --- changes in v2: - split v1 into two patches. v1 link: https://lore.kernel.org/r/20220512051815.11946-1-linmq006@gmail.com --- drivers/dma/ti/dma-crossbar.c | 4 ++++ 1 file changed, 4 insertions(+)