Unverified Commit aaa3557c authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!7385 CVE-2024-27002 

Merge Pull Request from: @ci-robot 
 
PR sync from: Yongqiang Liu <liuyongqiang13@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/LDJDJNP66UC342QMIEKYLDRFR5E4AYJR/ 
Yongqiang Liu (1):
  clk: mediatek: Do a runtime PM get on controllers during probe


-- 
2.34.1
 
https://gitee.com/src-openeuler/kernel/issues/I9L5DP 
 
Link:https://gitee.com/openeuler/kernel/pulls/7385

 

Reviewed-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
Signed-off-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
parents ab45699e 4ed45a98

drivers/clk/mediatek/clk-mt8183-mfgcfg.c

+14 −0
Original line number Diff line number Diff line
@@ -30,14 +30,28 @@ static int clk_mt8183_mfg_probe(struct platform_device *pdev) 
{

	struct clk_onecell_data *clk_data;

	struct device_node *node = pdev->dev.of_node;

	int ret;



	pm_runtime_enable(&pdev->dev);



	/*

	 * Do a pm_runtime_get_sync() to workaround a possible

	 * deadlock between clk_register() and the genpd framework.

	 */

	ret = pm_runtime_get_sync(&pdev->dev);

	if (ret < 0) {

		pm_runtime_put_noidle(&pdev->dev);

		return ret;

	}





	clk_data = mtk_alloc_clk_data(CLK_MFG_NR_CLK);



	mtk_clk_register_gates_with_dev(node, mfg_clks, ARRAY_SIZE(mfg_clks),

			clk_data, &pdev->dev);



	pm_runtime_put(&pdev->dev);



	return of_clk_add_provider(node, of_clk_src_onecell_get, clk_data);

}