dmaengine: ti: Add missing put_device in ti_dra7_xbar_route_allocate
Subsystems (2)
PATCH v2 1/1 dmaengine: ti: Add missing put_device in ti_dra7_xbar_route_allocate
of_find_device_by_node() takes reference, we should use put_device() to release it when not need anymore.
---
changes in v2:
- split v1 into two patches.
v1 link:
https://lore.kernel.org/r/[email protected]
--- drivers/dma/ti/dma-crossbar.c | 4 ++++ 1 file changed, 4 insertions(+)
drivers/dma/ti/dma-crossbar.c +4 -0
@@ -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);
Signature · 1 line
2.25.1
Quoted 2 lines · Miaoqian Lin
of_find_device_by_node()takes reference, we should useput_device()to release it when not need anymore.
adding a new label and using goto would be another option or even better?
Quoted 39 lines
Fixes a074ae38f859 ("dmaengine: Add driver for TI DMA crossbar on DRA7x")Signed-off-by Miaoqian Lin <[email protected]>---
changes in v2:
- split v1 into two patches.
v1 link:
https://lore.kernel.org/r/[email protected]--- drivers/dma/ti/dma-crossbar.c | 4 ++++ 1 file changed, 4 insertions(+)drivers/dma/ti/dma-crossbar.c +3
-0@@ -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 ); }
drivers/dma/ti/dma-crossbar.c static void *ti_dra7_xbar_route_allocate(struct of_phandle_args *dma_spec, · line 274
Quoted 4 lines
drivers/dma/ti/dma-crossbar.c +1
-0@@ -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!
Quoted 3 lines
drivers/dma/ti/dma-crossbar.c +0
-0return ERR_PTR (-ENOMEM ); }set_bit (map->xbar_out, xbar->dma_inuse);
Signature · 1 line
Péter