media: sunxi: Fix some error handling path of sun6i_mipi_csi2_probe()

Release some resources in the error handling path of the probe and of
sun6i_mipi_csi2_resources_setup(), as already done in the remove
function.

Fixes: af54b4f4c17f ("media: sunxi: Add support for the A31 MIPI CSI-2 controller")
Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
Acked-by: Paul Kocialkowski <paul.kocialkowski@bootlin.com>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>

diff --git a/drivers/media/platform/sunxi/sun6i-mipi-csi2/sun6i_mipi_csi2.c b/drivers/media/platform/sunxi/sun6i-mipi-csi2/sun6i_mipi_csi2.c
index a4e3f9a6b2ff26df6b53e5aefb5ae6e43258c125..30d6c0c5161f469cf2618f1b817e9219c3812190 100644 (file)
--- a/drivers/media/platform/sunxi/sun6i-mipi-csi2/sun6i_mipi_csi2.c
+++ b/drivers/media/platform/sunxi/sun6i-mipi-csi2/sun6i_mipi_csi2.c
@@ -661,7 +661,8 @@ sun6i_mipi_csi2_resources_setup(struct sun6i_mipi_csi2_device *csi2_dev,
        csi2_dev->reset = devm_reset_control_get_shared(dev, NULL);
        if (IS_ERR(csi2_dev->reset)) {
                dev_err(dev, "failed to get reset controller\n");
-               return PTR_ERR(csi2_dev->reset);
+               ret = PTR_ERR(csi2_dev->reset);
+               goto error_clock_rate_exclusive;
        }
 
        /* D-PHY */
@@ -669,13 +670,14 @@ sun6i_mipi_csi2_resources_setup(struct sun6i_mipi_csi2_device *csi2_dev,
        csi2_dev->dphy = devm_phy_get(dev, "dphy");
        if (IS_ERR(csi2_dev->dphy)) {
                dev_err(dev, "failed to get MIPI D-PHY\n");
-               return PTR_ERR(csi2_dev->dphy);
+               ret = PTR_ERR(csi2_dev->dphy);
+               goto error_clock_rate_exclusive;
        }
 
        ret = phy_init(csi2_dev->dphy);
        if (ret) {
                dev_err(dev, "failed to initialize MIPI D-PHY\n");
-               return ret;
+               goto error_clock_rate_exclusive;
        }
 
        /* Runtime PM */
@@ -683,6 +685,11 @@ sun6i_mipi_csi2_resources_setup(struct sun6i_mipi_csi2_device *csi2_dev,
        pm_runtime_enable(dev);
 
        return 0;
+
+error_clock_rate_exclusive:
+       clk_rate_exclusive_put(csi2_dev->clock_mod);
+
+       return ret;
 }
 
 static void
@@ -712,9 +719,14 @@ static int sun6i_mipi_csi2_probe(struct platform_device *platform_dev)
 
        ret = sun6i_mipi_csi2_bridge_setup(csi2_dev);
        if (ret)
-               return ret;
+               goto error_resources;
 
        return 0;
+
+error_resources:
+       sun6i_mipi_csi2_resources_cleanup(csi2_dev);
+
+       return ret;
 }
 
 static int sun6i_mipi_csi2_remove(struct platform_device *platform_dev)