media: sun4i-csi: Clean up media device on probe errors
PATCH 1/1 media: sun4i-csi: Clean up media device on probe errors
sun4i_csi_probe() initializes the media device before acquiring the MMIO resource, IRQ, clocks, reset control and media entity pads. Several of those failure paths return directly.
media_device_cleanup() is still required after media_device_init(), and a failed probe does not run the driver remove callback. Route those errors through the existing media-device cleanup path before returning.
Co-developed-by Ijae Kim <[email protected]>
Signed-off-by Ijae Kim <[email protected]>
Signed-off-by Myeonghun Pak <[email protected]>
--- drivers/media/platform/sunxi/sun4i-csi/sun4i_csi.c | 30 ++++++++++++++-------- 1 file changed, 19 insertions(+), 11 deletions(-)
drivers/media/platform/sunxi/sun4i-csi/sun4i_csi.c +19 -11
@@ -187,37 +187,45 @@ static int sun4i_csi_probe(struct platform_device *pdev) csi->v4l.mdev = &csi->mdev; csi->regs =devm_platform_ioremap_resource (pdev,0 ); -if (IS_ERR (csi->regs)) -return PTR_ERR (csi->regs); +if (IS_ERR (csi->regs)) { + ret =PTR_ERR (csi->regs); + goto err_clean_mdev; + } irq =platform_get_irq (pdev,0 ); -if (irq <0 ) -return irq; +if (irq <0 ) { + ret = irq; + goto err_clean_mdev; + } csi->bus_clk =devm_clk_get (&pdev->dev,"bus" );if (IS_ERR (csi->bus_clk)) {dev_err (&pdev->dev,"Couldn't get our bus clock\n" ); -return PTR_ERR (csi->bus_clk); + ret =PTR_ERR (csi->bus_clk); + goto err_clean_mdev; }if (csi->traits->has_isp) { csi->isp_clk =devm_clk_get (&pdev->dev,"isp" );if (IS_ERR (csi->isp_clk)) {dev_err (&pdev->dev,"Couldn't get our ISP clock\n" ); -return PTR_ERR (csi->isp_clk); + ret =PTR_ERR (csi->isp_clk); + goto err_clean_mdev; } } csi->ram_clk =devm_clk_get (&pdev->dev,"ram" );if (IS_ERR (csi->ram_clk)) {dev_err (&pdev->dev,"Couldn't get our ram clock\n" ); -return PTR_ERR (csi->ram_clk); + ret =PTR_ERR (csi->ram_clk); + goto err_clean_mdev; } csi->rst =devm_reset_control_get (&pdev->dev,NULL );if (IS_ERR (csi->rst)) {dev_err (&pdev->dev,"Couldn't get our reset line\n" ); -return PTR_ERR (csi->rst); + ret =PTR_ERR (csi->rst); + goto err_clean_mdev; }/* Initialize subdev */
@@ -236,13 +244,13 @@ static int sun4i_csi_probe(struct platform_device *pdev) ret =media_entity_pads_init (&subdev->entity,CSI_SUBDEV_PADS , csi->subdev_pads);if (ret <0 ) -return ret; + goto err_clean_mdev; csi->vdev_pad.flags =MEDIA_PAD_FL_SINK |MEDIA_PAD_FL_MUST_CONNECT ; vdev->entity.ops = &sun4i_csi_video_entity_ops; ret =media_entity_pads_init (&vdev->entity,1 , &csi->vdev_pad);if (ret <0 ) -return ret; + goto err_clean_mdev; ret =sun4i_csi_dma_register (csi, irq);if (ret)
@@ -266,7 +274,7 @@ static int sun4i_csi_probe(struct platform_device *pdev)media_device_unregister (&csi->mdev);sun4i_csi_dma_unregister (csi); -err_clean_pad: +err_clean_mdev:media_device_cleanup (&csi->mdev);return ret;