File tree Expand file tree Collapse file tree 1 file changed +5
-5
lines changed Expand file tree Collapse file tree 1 file changed +5
-5
lines changed Original file line number Diff line number Diff line change @@ -1730,14 +1730,15 @@ static int mtk_hdmi_probe(struct platform_device *pdev)
1730
1730
hdmi -> bridge .type = DRM_MODE_CONNECTOR_HDMIA ;
1731
1731
hdmi -> bridge .vendor = "MediaTek" ;
1732
1732
hdmi -> bridge .product = "On-Chip HDMI" ;
1733
- drm_bridge_add (& hdmi -> bridge );
1733
+
1734
+ ret = devm_drm_bridge_add (dev , & hdmi -> bridge );
1735
+ if (ret )
1736
+ return dev_err_probe (dev , ret , "Failed to add bridge\n" );
1734
1737
1735
1738
ret = mtk_hdmi_clk_enable_audio (hdmi );
1736
- if (ret ) {
1737
- drm_bridge_remove (& hdmi -> bridge );
1739
+ if (ret )
1738
1740
return dev_err_probe (dev , ret ,
1739
1741
"Failed to enable audio clocks\n" );
1740
- }
1741
1742
1742
1743
return 0 ;
1743
1744
}
@@ -1746,7 +1747,6 @@ static void mtk_hdmi_remove(struct platform_device *pdev)
1746
1747
{
1747
1748
struct mtk_hdmi * hdmi = platform_get_drvdata (pdev );
1748
1749
1749
- drm_bridge_remove (& hdmi -> bridge );
1750
1750
mtk_hdmi_clk_disable_audio (hdmi );
1751
1751
}
1752
1752
You can’t perform that action at this time.
0 commit comments