| Message ID | dd5b741f496d074d342958f14baff5bae8c71531.1693429556.git.christophe.jaillet@wanadoo.fr (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | media: imx-mipi-csis: Remove an incorrect fwnode_handle_put() call | expand |
Hi Christophe, Thank you for the patch. On Wed, Aug 30, 2023 at 11:06:14PM +0200, Christophe JAILLET wrote: > The commit in Fixes has removed an fwnode_graph_get_endpoint_by_id() call > in mipi_csis_subdev_init(). > So the reference that was taken should not be released anymore in the > error handling path of the probe and in the remove function. > > Remove the now incorrect fwnode_handle_put() calls. > > Fixes: 1029939b3782 ("media: v4l: async: Simplify async sub-device fwnode matching") > Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr> Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> > --- > drivers/media/platform/nxp/imx-mipi-csis.c | 2 -- > 1 file changed, 2 deletions(-) > > diff --git a/drivers/media/platform/nxp/imx-mipi-csis.c b/drivers/media/platform/nxp/imx-mipi-csis.c > index 16f19a640130..5f93712bf485 100644 > --- a/drivers/media/platform/nxp/imx-mipi-csis.c > +++ b/drivers/media/platform/nxp/imx-mipi-csis.c > @@ -1490,7 +1490,6 @@ static int mipi_csis_probe(struct platform_device *pdev) > v4l2_async_unregister_subdev(&csis->sd); > err_disable_clock: > mipi_csis_clk_disable(csis); > - fwnode_handle_put(csis->sd.fwnode); > > return ret; > } > @@ -1510,7 +1509,6 @@ static void mipi_csis_remove(struct platform_device *pdev) > mipi_csis_clk_disable(csis); > v4l2_subdev_cleanup(&csis->sd); > media_entity_cleanup(&csis->sd.entity); > - fwnode_handle_put(csis->sd.fwnode); > pm_runtime_set_suspended(&pdev->dev); > } >
Hi Christophe, Many thanks for the fix. Christophe JAILLET <christophe.jaillet@wanadoo.fr> writes: > The commit in Fixes has removed an fwnode_graph_get_endpoint_by_id() call > in mipi_csis_subdev_init(). > So the reference that was taken should not be released anymore in the > error handling path of the probe and in the remove function. > > Remove the now incorrect fwnode_handle_put() calls. > > Fixes: 1029939b3782 ("media: v4l: async: Simplify async sub-device fwnode matching") > Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr> LGTM. Reviewed-by: Rui Miguel Silva <rmfrfs@gmail.com> Cheers, Rui > --- > drivers/media/platform/nxp/imx-mipi-csis.c | 2 -- > 1 file changed, 2 deletions(-) > > diff --git a/drivers/media/platform/nxp/imx-mipi-csis.c b/drivers/media/platform/nxp/imx-mipi-csis.c > index 16f19a640130..5f93712bf485 100644 > --- a/drivers/media/platform/nxp/imx-mipi-csis.c > +++ b/drivers/media/platform/nxp/imx-mipi-csis.c > @@ -1490,7 +1490,6 @@ static int mipi_csis_probe(struct platform_device *pdev) > v4l2_async_unregister_subdev(&csis->sd); > err_disable_clock: > mipi_csis_clk_disable(csis); > - fwnode_handle_put(csis->sd.fwnode); > > return ret; > } > @@ -1510,7 +1509,6 @@ static void mipi_csis_remove(struct platform_device *pdev) > mipi_csis_clk_disable(csis); > v4l2_subdev_cleanup(&csis->sd); > media_entity_cleanup(&csis->sd.entity); > - fwnode_handle_put(csis->sd.fwnode); > pm_runtime_set_suspended(&pdev->dev); > } > > -- > 2.34.1
diff --git a/drivers/media/platform/nxp/imx-mipi-csis.c b/drivers/media/platform/nxp/imx-mipi-csis.c index 16f19a640130..5f93712bf485 100644 --- a/drivers/media/platform/nxp/imx-mipi-csis.c +++ b/drivers/media/platform/nxp/imx-mipi-csis.c @@ -1490,7 +1490,6 @@ static int mipi_csis_probe(struct platform_device *pdev) v4l2_async_unregister_subdev(&csis->sd); err_disable_clock: mipi_csis_clk_disable(csis); - fwnode_handle_put(csis->sd.fwnode); return ret; } @@ -1510,7 +1509,6 @@ static void mipi_csis_remove(struct platform_device *pdev) mipi_csis_clk_disable(csis); v4l2_subdev_cleanup(&csis->sd); media_entity_cleanup(&csis->sd.entity); - fwnode_handle_put(csis->sd.fwnode); pm_runtime_set_suspended(&pdev->dev); }
The commit in Fixes has removed an fwnode_graph_get_endpoint_by_id() call in mipi_csis_subdev_init(). So the reference that was taken should not be released anymore in the error handling path of the probe and in the remove function. Remove the now incorrect fwnode_handle_put() calls. Fixes: 1029939b3782 ("media: v4l: async: Simplify async sub-device fwnode matching") Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr> --- drivers/media/platform/nxp/imx-mipi-csis.c | 2 -- 1 file changed, 2 deletions(-)