]> git.baikalelectronics.ru Git - kernel.git/commitdiff
drm/exynos: dsi: Remove bridge node reference in error handling path in probe function
authorChristophe JAILLET <christophe.jaillet@wanadoo.fr>
Sat, 16 May 2020 10:57:36 +0000 (12:57 +0200)
committerInki Dae <inki.dae@samsung.com>
Mon, 18 May 2020 04:16:27 +0000 (13:16 +0900)
'exynos_dsi_parse_dt()' takes a reference to 'dsi->in_bridge_node'.
This must be released in the error handling path.

In order to do that, add an error handling path and move the
'exynos_dsi_parse_dt()' call from the beginning to the end of the probe
function to ease the error handling path.
This function only sets some variables which are used only in the
'transfer' function.

The call chain is:
   .transfer
    --> exynos_dsi_host_transfer
      --> exynos_dsi_init
        --> exynos_dsi_enable_clock  (use burst_clk_rate and esc_clk_rate)
          --> exynos_dsi_set_pll     (use pll_clk_rate)

While at it, also handle cases where 'component_add()' fails.

This patch is similar to commit 43491a3bd6e4 ("drm/exynos: dsi: Remove bridge node reference in removal")
which fixed the issue in the remove function.

Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
Signed-off-by: Inki Dae <inki.dae@samsung.com>
drivers/gpu/drm/exynos/exynos_drm_dsi.c

index eb1486d2dd22702ebe71235ee3149d9c20bad503..ee96a95fb6be50824d3483530d5e4ae14135d1df 100644 (file)
@@ -1759,10 +1759,6 @@ static int exynos_dsi_probe(struct platform_device *pdev)
        dsi->dev = dev;
        dsi->driver_data = of_device_get_match_data(dev);
 
-       ret = exynos_dsi_parse_dt(dsi);
-       if (ret)
-               return ret;
-
        dsi->supplies[0].supply = "vddcore";
        dsi->supplies[1].supply = "vddio";
        ret = devm_regulator_bulk_get(dev, ARRAY_SIZE(dsi->supplies),
@@ -1821,11 +1817,25 @@ static int exynos_dsi_probe(struct platform_device *pdev)
                return ret;
        }
 
+       ret = exynos_dsi_parse_dt(dsi);
+       if (ret)
+               return ret;
+
        platform_set_drvdata(pdev, &dsi->encoder);
 
        pm_runtime_enable(dev);
 
-       return component_add(dev, &exynos_dsi_component_ops);
+       ret = component_add(dev, &exynos_dsi_component_ops);
+       if (ret)
+               goto err_disable_runtime;
+
+       return 0;
+
+err_disable_runtime:
+       pm_runtime_disable(dev);
+       of_node_put(dsi->in_bridge_node);
+
+       return ret;
 }
 
 static int exynos_dsi_remove(struct platform_device *pdev)