Commit 547a7348 authored by Christophe JAILLET's avatar Christophe JAILLET Committed by Inki Dae

drm/exynos: dsi: Remove bridge node reference in error handling path in probe function

'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 70505c2e ("drm/exynos: dsi: Remove bridge node reference in removal")
which fixed the issue in the remove function.
Signed-off-by: default avatarChristophe JAILLET <christophe.jaillet@wanadoo.fr>
Signed-off-by: default avatarInki Dae <inki.dae@samsung.com>
parent fda02214
...@@ -1759,10 +1759,6 @@ static int exynos_dsi_probe(struct platform_device *pdev) ...@@ -1759,10 +1759,6 @@ static int exynos_dsi_probe(struct platform_device *pdev)
dsi->dev = dev; dsi->dev = dev;
dsi->driver_data = of_device_get_match_data(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[0].supply = "vddcore";
dsi->supplies[1].supply = "vddio"; dsi->supplies[1].supply = "vddio";
ret = devm_regulator_bulk_get(dev, ARRAY_SIZE(dsi->supplies), ret = devm_regulator_bulk_get(dev, ARRAY_SIZE(dsi->supplies),
...@@ -1821,11 +1817,25 @@ static int exynos_dsi_probe(struct platform_device *pdev) ...@@ -1821,11 +1817,25 @@ static int exynos_dsi_probe(struct platform_device *pdev)
return ret; return ret;
} }
ret = exynos_dsi_parse_dt(dsi);
if (ret)
return ret;
platform_set_drvdata(pdev, &dsi->encoder); platform_set_drvdata(pdev, &dsi->encoder);
pm_runtime_enable(dev); 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) static int exynos_dsi_remove(struct platform_device *pdev)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment