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

!8696 clk: mediatek: clk-mt6797: Add check for mtk_alloc_clk_data 

Merge Pull Request from: @ci-robot 
 
PR sync from: Zhang Zekun <zhangzekun11@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/BPCU3HBWUM6VV2ZEOSA6PB66I7I4RSGT/ 
 
https://gitee.com/src-openeuler/kernel/issues/I9RK78 
 
Link:https://gitee.com/openeuler/kernel/pulls/8696

 

Reviewed-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
Signed-off-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
parents 6c7e3ca6 6fed8846

drivers/clk/mediatek/clk-mt6797.c

+6 −0
Original line number Diff line number Diff line
@@ -391,6 +391,8 @@ static int mtk_topckgen_init(struct platform_device *pdev) 
		return PTR_ERR(base);



	clk_data = mtk_alloc_clk_data(CLK_TOP_NR);

	if (!clk_data)

		return -ENOMEM;



	mtk_clk_register_factors(top_fixed_divs, ARRAY_SIZE(top_fixed_divs),

				 clk_data);
@@ -563,6 +565,8 @@ static void mtk_infrasys_init_early(struct device_node *node) 


	if (!infra_clk_data) {

		infra_clk_data = mtk_alloc_clk_data(CLK_INFRA_NR);

		if (!infra_clk_data)

			return;



		for (i = 0; i < CLK_INFRA_NR; i++)

			infra_clk_data->clks[i] = ERR_PTR(-EPROBE_DEFER);
@@ -587,6 +591,8 @@ static int mtk_infrasys_init(struct platform_device *pdev) 


	if (!infra_clk_data) {

		infra_clk_data = mtk_alloc_clk_data(CLK_INFRA_NR);

		if (!infra_clk_data)

			return -ENOMEM;

	} else {

		for (i = 0; i < CLK_INFRA_NR; i++) {

			if (infra_clk_data->clks[i] == ERR_PTR(-EPROBE_DEFER))