shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-05 10:31:46 +09:00
Code Issues Packages Projects Releases Wiki Activity

drm/tegra: hdmi: Fix some error handling paths in tegra_hdmi_probe()

Browse Source 
[ Upstream commit 643ae131b8598fb2940c92c7d23fe62823a119c8 ]

If an error occurs after calling tegra_output_probe(),
tegra_output_remove() should be called as already done in the remove
function.

Fixes: 59d29c0ec9 ("drm/tegra: Allocate resources at probe time")
Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
Signed-off-by: Thierry Reding <treding@nvidia.com>
Link: https://patchwork.freedesktop.org/patch/msgid/9b7c564eb71977678b20abd73ee52001a51cf327.1693667005.git.christophe.jaillet@wanadoo.fr
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Christophe JAILLET
2023-09-02 17:22:10 +02:00
committed by Sasha Levin
parent 8bc95d3440
commit bb459d437d
1 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
drivers/gpu/drm/tegra/hdmi.c
View File

@@ -1838,12 +1838,14 @@ static int tegra_hdmi_probe(struct platform_device *pdev)
return err; return err;
hdmi->regs = devm_platform_ioremap_resource(pdev, 0); hdmi->regs = devm_platform_ioremap_resource(pdev, 0);
if (IS_ERR(hdmi->regs)) if (IS_ERR(hdmi->regs)) {
return PTR_ERR(hdmi->regs); err = PTR_ERR(hdmi->regs);
goto remove;
}
err = platform_get_irq(pdev, 0); err = platform_get_irq(pdev, 0);
if (err < 0) if (err < 0)
return err; goto remove;
hdmi->irq = err; hdmi->irq = err;
@@ -1852,18 +1854,18 @@ static int tegra_hdmi_probe(struct platform_device *pdev)
if (err < 0) { if (err < 0) {
dev_err(&pdev->dev, "failed to request IRQ#%u: %d\n", dev_err(&pdev->dev, "failed to request IRQ#%u: %d\n",
hdmi->irq, err); hdmi->irq, err);
return err; goto remove;
} }
platform_set_drvdata(pdev, hdmi); platform_set_drvdata(pdev, hdmi);
err = devm_pm_runtime_enable(&pdev->dev); err = devm_pm_runtime_enable(&pdev->dev);
if (err) if (err)
return err; goto remove;
err = devm_tegra_core_dev_init_opp_table_common(&pdev->dev); err = devm_tegra_core_dev_init_opp_table_common(&pdev->dev);
if (err) if (err)
return err; goto remove;
INIT_LIST_HEAD(&hdmi->client.list); INIT_LIST_HEAD(&hdmi->client.list);
hdmi->client.ops = &hdmi_client_ops; hdmi->client.ops = &hdmi_client_ops;
@@ -1873,10 +1875,14 @@ static int tegra_hdmi_probe(struct platform_device *pdev)
if (err < 0) { if (err < 0) {
dev_err(&pdev->dev, "failed to register host1x client: %d\n", dev_err(&pdev->dev, "failed to register host1x client: %d\n",
err); err);
return err; goto remove;
} }
return 0; return 0;
remove:
tegra_output_remove(&hdmi->output);
return err;
} }
static int tegra_hdmi_remove(struct platform_device *pdev) static int tegra_hdmi_remove(struct platform_device *pdev)