openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

drm/tegra: dpaux: Clean-up on probe failure 

If the probing of the DPAUX fails, then clocks are left enabled and the
DPAUX reset de-asserted. Add code to perform the necessary clean-up on
probe failure by disabling clocks and asserting the reset.

Signed-off-by: Jon Hunter <jonathanh@nvidia.com>
Signed-off-by: Thierry Reding <treding@nvidia.com>
This commit is contained in:
Jon Hunter 2016-06-29 10:17:48 +01:00 committed by Thierry Reding
parent 4b92e2948f
commit bcbd63dfc9
1 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
drivers/gpu/drm/tegra/dpaux.c
View File

@ -321,28 +321,30 @@ static int tegra_dpaux_probe(struct platform_device *pdev)
if (IS_ERR(dpaux->clk_parent)) { if (IS_ERR(dpaux->clk_parent)) {
dev_err(&pdev->dev, "failed to get parent clock: %ld\n", dev_err(&pdev->dev, "failed to get parent clock: %ld\n",
PTR_ERR(dpaux->clk_parent)); PTR_ERR(dpaux->clk_parent));
return PTR_ERR(dpaux->clk_parent); err = PTR_ERR(dpaux->clk_parent);
goto assert_reset;
} }
err = clk_prepare_enable(dpaux->clk_parent); err = clk_prepare_enable(dpaux->clk_parent);
if (err < 0) { if (err < 0) {
dev_err(&pdev->dev, "failed to enable parent clock: %d\n", dev_err(&pdev->dev, "failed to enable parent clock: %d\n",
err); err);
return err; goto assert_reset;
} }
err = clk_set_rate(dpaux->clk_parent, 270000000); err = clk_set_rate(dpaux->clk_parent, 270000000);
if (err < 0) { if (err < 0) {
dev_err(&pdev->dev, "failed to set clock to 270 MHz: %d\n", dev_err(&pdev->dev, "failed to set clock to 270 MHz: %d\n",
err); err);
return err; goto disable_parent_clk;
} }
dpaux->vdd = devm_regulator_get(&pdev->dev, "vdd"); dpaux->vdd = devm_regulator_get(&pdev->dev, "vdd");
if (IS_ERR(dpaux->vdd)) { if (IS_ERR(dpaux->vdd)) {
dev_err(&pdev->dev, "failed to get VDD supply: %ld\n", dev_err(&pdev->dev, "failed to get VDD supply: %ld\n",
PTR_ERR(dpaux->vdd)); PTR_ERR(dpaux->vdd));
return PTR_ERR(dpaux->vdd); err = PTR_ERR(dpaux->vdd);
goto disable_parent_clk;
} }
err = devm_request_irq(dpaux->dev, dpaux->irq, tegra_dpaux_irq, 0, err = devm_request_irq(dpaux->dev, dpaux->irq, tegra_dpaux_irq, 0,
@ -350,7 +352,7 @@ static int tegra_dpaux_probe(struct platform_device *pdev)
if (err < 0) { if (err < 0) {
dev_err(dpaux->dev, "failed to request IRQ#%u: %d\n", dev_err(dpaux->dev, "failed to request IRQ#%u: %d\n",
dpaux->irq, err); dpaux->irq, err);
return err; goto disable_parent_clk;
} }
disable_irq(dpaux->irq); disable_irq(dpaux->irq);
@ -360,7 +362,7 @@ static int tegra_dpaux_probe(struct platform_device *pdev)
err = drm_dp_aux_register(&dpaux->aux); err = drm_dp_aux_register(&dpaux->aux);
if (err < 0) if (err < 0)
return err; goto disable_parent_clk;
/* /*
* Assume that by default the DPAUX/I2C pads will be used for HDMI, * Assume that by default the DPAUX/I2C pads will be used for HDMI,
@ -393,6 +395,14 @@ static int tegra_dpaux_probe(struct platform_device *pdev)
platform_set_drvdata(pdev, dpaux); platform_set_drvdata(pdev, dpaux);
return 0; return 0;
disable_parent_clk:
clk_disable_unprepare(dpaux->clk_parent);
assert_reset:
reset_control_assert(dpaux->rst);
clk_disable_unprepare(dpaux->clk);
return err;
} }
static int tegra_dpaux_remove(struct platform_device *pdev) static int tegra_dpaux_remove(struct platform_device *pdev)