mirror of
https://github.com/AuxXxilium/linux_dsm_epyc7002.git
synced 2024-12-09 01:16:41 +07:00
OMAPDSS: fix dss_init_ports error handling
The return value of dss_init_ports() is not handled at all, causing crashes later if the call failed. This patch adds the error handling, and we also move the call to a slightly earlier place to make bailing out easier. Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com> Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
This commit is contained in:
parent
7e328f5adc
commit
f5a1a1f8e4
@ -1125,6 +1125,10 @@ static int __init omap_dsshw_probe(struct platform_device *pdev)
|
|||||||
if (r)
|
if (r)
|
||||||
goto err_pll_init;
|
goto err_pll_init;
|
||||||
|
|
||||||
|
r = dss_init_ports(pdev);
|
||||||
|
if (r)
|
||||||
|
goto err_init_ports;
|
||||||
|
|
||||||
pm_runtime_enable(&pdev->dev);
|
pm_runtime_enable(&pdev->dev);
|
||||||
|
|
||||||
r = dss_runtime_get();
|
r = dss_runtime_get();
|
||||||
@ -1149,8 +1153,6 @@ static int __init omap_dsshw_probe(struct platform_device *pdev)
|
|||||||
dss.lcd_clk_source[0] = OMAP_DSS_CLK_SRC_FCK;
|
dss.lcd_clk_source[0] = OMAP_DSS_CLK_SRC_FCK;
|
||||||
dss.lcd_clk_source[1] = OMAP_DSS_CLK_SRC_FCK;
|
dss.lcd_clk_source[1] = OMAP_DSS_CLK_SRC_FCK;
|
||||||
|
|
||||||
dss_init_ports(pdev);
|
|
||||||
|
|
||||||
rev = dss_read_reg(DSS_REVISION);
|
rev = dss_read_reg(DSS_REVISION);
|
||||||
printk(KERN_INFO "OMAP DSS rev %d.%d\n",
|
printk(KERN_INFO "OMAP DSS rev %d.%d\n",
|
||||||
FLD_GET(rev, 7, 4), FLD_GET(rev, 3, 0));
|
FLD_GET(rev, 7, 4), FLD_GET(rev, 3, 0));
|
||||||
@ -1167,7 +1169,8 @@ static int __init omap_dsshw_probe(struct platform_device *pdev)
|
|||||||
|
|
||||||
err_runtime_get:
|
err_runtime_get:
|
||||||
pm_runtime_disable(&pdev->dev);
|
pm_runtime_disable(&pdev->dev);
|
||||||
|
dss_uninit_ports(pdev);
|
||||||
|
err_init_ports:
|
||||||
if (dss.video1_pll)
|
if (dss.video1_pll)
|
||||||
dss_video_pll_uninit(dss.video1_pll);
|
dss_video_pll_uninit(dss.video1_pll);
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user