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

!10187 fix CVE-2021-47205 

Merge Pull Request from: @ci-robot 
 
PR sync from: Lin Yujun <linyujun809@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/DVPT7CGEVEDQXPJWXZ66TSNQY7DUNT3B/ 
*** BLURB HERE ***

Samuel Holland (1):
  clk: sunxi-ng: Unregister clocks/resets when unbinding


-- 
2.34.1
 
https://gitee.com/src-openeuler/kernel/issues/I9FNFT 
 
Link:https://gitee.com/openeuler/kernel/pulls/10187

 

Reviewed-by: default avatarZhang Jianhua <chris.zjh@huawei.com>
Signed-off-by: default avatarYang Yingliang <yangyingliang@huawei.com>
parents ec1052d5 8a4f84cb

drivers/clk/sunxi-ng/ccu-sun4i-a10.c

+1 −1
Original line number Diff line number Diff line
@@ -1464,7 +1464,7 @@ static void __init sun4i_ccu_init(struct device_node *node, 
	val &= ~GENMASK(7, 6);

	writel(val | (2 << 6), reg + SUN4I_AHB_REG);



	sunxi_ccu_probe(node, reg, desc);

	of_sunxi_ccu_probe(node, reg, desc);

}



static void __init sun4i_a10_ccu_setup(struct device_node *node)

drivers/clk/sunxi-ng/ccu-sun50i-a100-r.c

+1 −1
Original line number Diff line number Diff line
@@ -196,7 +196,7 @@ static int sun50i_a100_r_ccu_probe(struct platform_device *pdev) 
	if (IS_ERR(reg))

		return PTR_ERR(reg);



	return sunxi_ccu_probe(pdev->dev.of_node, reg, &sun50i_a100_r_ccu_desc);

	return devm_sunxi_ccu_probe(&pdev->dev, reg, &sun50i_a100_r_ccu_desc);

}



static const struct of_device_id sun50i_a100_r_ccu_ids[] = {

drivers/clk/sunxi-ng/ccu-sun50i-a100.c

+1 −1
Original line number Diff line number Diff line
@@ -1247,7 +1247,7 @@ static int sun50i_a100_ccu_probe(struct platform_device *pdev) 
		writel(val, reg + sun50i_a100_usb2_clk_regs[i]);

	}



	ret = sunxi_ccu_probe(pdev->dev.of_node, reg, &sun50i_a100_ccu_desc);

	ret = devm_sunxi_ccu_probe(&pdev->dev, reg, &sun50i_a100_ccu_desc);

	if (ret)

		return ret;

drivers/clk/sunxi-ng/ccu-sun50i-a64.c

+1 −1
Original line number Diff line number Diff line
@@ -955,7 +955,7 @@ static int sun50i_a64_ccu_probe(struct platform_device *pdev) 


	writel(0x515, reg + SUN50I_A64_PLL_MIPI_REG);



	ret = sunxi_ccu_probe(pdev->dev.of_node, reg, &sun50i_a64_ccu_desc);

	ret = devm_sunxi_ccu_probe(&pdev->dev, reg, &sun50i_a64_ccu_desc);

	if (ret)

		return ret;

drivers/clk/sunxi-ng/ccu-sun50i-h6-r.c

+1 −1
Original line number Diff line number Diff line
@@ -186,7 +186,7 @@ static void __init sunxi_r_ccu_init(struct device_node *node, 
		return;

	}



	sunxi_ccu_probe(node, reg, desc);

	of_sunxi_ccu_probe(node, reg, desc);

}



static void __init sun50i_h6_r_ccu_setup(struct device_node *node)