clk: mediatek: mt6735: Unregister PLLs on probe failure
Subsystems (3)
PATCH v2 1/1 clk: mediatek: mt6735: Unregister PLLs on probe failure
mtk_clk_register_plls() registers the apmixedsys PLL clocks manually, while clk_mt6735_apmixed_remove() unregisters them on driver removal.
If devm_of_clk_add_hw_provider() fails after the PLL registration succeeds, probe returns the error directly and the remove callback is not run. This leaves the registered PLL clocks behind on the probe failure path.
Unregister the PLLs in that failure branch before returning the error.
---
Changes in v2:
- Unregister PLLs directly in the provider-registration failure branch.
- Wrap the commit message line flagged by checkpatch.
drivers/clk/mediatek/clk-mt6735-apmixedsys.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/clk/mediatek/clk-mt6735-apmixedsys.c +4 -1
@@ -102,9 +102,12 @@ static int clk_mt6735_apmixed_probe(struct platform_device *pdev) ret =devm_of_clk_add_hw_provider (&pdev->dev, of_clk_hw_onecell_get, clk_data); -if (ret) +if (ret) {dev_err (&pdev->dev,"Failed to register clock provider: %d\n" , ret); +mtk_clk_unregister_plls (apmixedsys_plls,ARRAY_SIZE (apmixedsys_plls), + clk_data); + }return ret; }
Signature · 1 line
2.47.1
Quoted 7 lines · Myeonghun Pak
mtk_clk_register_plls()registers the apmixedsys PLL clocks manually, whileclk_mt6735_apmixed_remove()unregisters them on driver removal.If
devm_of_clk_add_hw_provider()fails after the PLL registration succeeds, probe returns the error directly and the remove callback is not run. This leaves the registered PLL clocks behind on the probe failure path.
Quoted 6 lines
Unregister the PLLs in that failure branch before returning the error.
Fixes 43c04ed79189 ("clk: mediatek: Add drivers for MediaTek MT6735 main clock and reset drivers")Co-developed-by Ijae Kim <[email protected]>Signed-off-by Ijae Kim <[email protected]>Signed-off-by Myeonghun Pak <[email protected]>