Commit 9f15930b authored by Miaoqian Lin's avatar Miaoqian Lin Committed by Robert Foss

drm/bridge: Fix error handling in analogix_dp_probe

In the error handling path, the clk_prepare_enable() function
call should be balanced by a corresponding 'clk_disable_unprepare()'
call, as already done in the remove function.

Fixes: 3424e3a4 ("drm: bridge: analogix/dp: split exynos dp driver to bridge directory")
Signed-off-by: default avatarMiaoqian Lin <linmq006@gmail.com>
Reviewed-by: default avatarRobert Foss <robert.foss@linaro.org>
Signed-off-by: default avatarRobert Foss <robert.foss@linaro.org>
Link: https://patchwork.freedesktop.org/patch/msgid/20220420011644.25730-1-linmq006@gmail.com
parent f06e2167
...@@ -1708,8 +1708,10 @@ analogix_dp_probe(struct device *dev, struct analogix_dp_plat_data *plat_data) ...@@ -1708,8 +1708,10 @@ analogix_dp_probe(struct device *dev, struct analogix_dp_plat_data *plat_data)
res = platform_get_resource(pdev, IORESOURCE_MEM, 0); res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
dp->reg_base = devm_ioremap_resource(&pdev->dev, res); dp->reg_base = devm_ioremap_resource(&pdev->dev, res);
if (IS_ERR(dp->reg_base)) if (IS_ERR(dp->reg_base)) {
return ERR_CAST(dp->reg_base); ret = PTR_ERR(dp->reg_base);
goto err_disable_clk;
}
dp->force_hpd = of_property_read_bool(dev->of_node, "force-hpd"); dp->force_hpd = of_property_read_bool(dev->of_node, "force-hpd");
...@@ -1721,7 +1723,8 @@ analogix_dp_probe(struct device *dev, struct analogix_dp_plat_data *plat_data) ...@@ -1721,7 +1723,8 @@ analogix_dp_probe(struct device *dev, struct analogix_dp_plat_data *plat_data)
if (IS_ERR(dp->hpd_gpiod)) { if (IS_ERR(dp->hpd_gpiod)) {
dev_err(dev, "error getting HDP GPIO: %ld\n", dev_err(dev, "error getting HDP GPIO: %ld\n",
PTR_ERR(dp->hpd_gpiod)); PTR_ERR(dp->hpd_gpiod));
return ERR_CAST(dp->hpd_gpiod); ret = PTR_ERR(dp->hpd_gpiod);
goto err_disable_clk;
} }
if (dp->hpd_gpiod) { if (dp->hpd_gpiod) {
...@@ -1741,7 +1744,8 @@ analogix_dp_probe(struct device *dev, struct analogix_dp_plat_data *plat_data) ...@@ -1741,7 +1744,8 @@ analogix_dp_probe(struct device *dev, struct analogix_dp_plat_data *plat_data)
if (dp->irq == -ENXIO) { if (dp->irq == -ENXIO) {
dev_err(&pdev->dev, "failed to get irq\n"); dev_err(&pdev->dev, "failed to get irq\n");
return ERR_PTR(-ENODEV); ret = -ENODEV;
goto err_disable_clk;
} }
ret = devm_request_threaded_irq(&pdev->dev, dp->irq, ret = devm_request_threaded_irq(&pdev->dev, dp->irq,
...@@ -1750,11 +1754,15 @@ analogix_dp_probe(struct device *dev, struct analogix_dp_plat_data *plat_data) ...@@ -1750,11 +1754,15 @@ analogix_dp_probe(struct device *dev, struct analogix_dp_plat_data *plat_data)
irq_flags, "analogix-dp", dp); irq_flags, "analogix-dp", dp);
if (ret) { if (ret) {
dev_err(&pdev->dev, "failed to request irq\n"); dev_err(&pdev->dev, "failed to request irq\n");
return ERR_PTR(ret); goto err_disable_clk;
} }
disable_irq(dp->irq); disable_irq(dp->irq);
return dp; return dp;
err_disable_clk:
clk_disable_unprepare(dp->clock);
return ERR_PTR(ret);
} }
EXPORT_SYMBOL_GPL(analogix_dp_probe); EXPORT_SYMBOL_GPL(analogix_dp_probe);
......
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