Skip to contentSkip to conversation

clk: qcom: lpass-sc7180: Clean up on error in lpass_sc7180_init()

PATCH Applied Dan Carpenter 3 participants 3 messages Nov 13, 2020 – Nov 14, 2020

Subsystems (4)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 clk: qcom: lpass-sc7180: Clean up on error in lpass_sc7180_init()

Clean up the first driver if the second driver can't be registered.

Fixes 4ee9fe3e292b ("clk: qcom: lpass-sc7180: Disentangle the two clock devices")
---
 drivers/clk/qcom/lpasscorecc-sc7180.c | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)
drivers/clk/qcom/lpasscorecc-sc7180.c +7 -1
index 1a3925badd7c..9081649f476f 100644
@@ -491,7 +491,13 @@ static int __init lpass_sc7180_init(void)
 	if (ret)
 		return ret;
 
-	return platform_driver_register(&lpass_hm_sc7180_driver);
+	ret = platform_driver_register(&lpass_hm_sc7180_driver);
+	if (ret) {
+		platform_driver_unregister(&lpass_core_cc_sc7180_driver);
+		return ret;
+	}
+
+	return 0;
 }
 subsys_initcall(lpass_sc7180_init);
 
Signature · 1 line
2.28.0
Reviewed-by on v1 1/1
#1 lore raw

Hi,

Quoted 15 lines · Dan Carpenter

Clean up the first driver if the second driver can't be registered.

Fixes 4ee9fe3e292b ("clk: qcom: lpass-sc7180: Disentangle the two clock devices")
---
 drivers/clk/qcom/lpasscorecc-sc7180.c | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)
drivers/clk/qcom/lpasscorecc-sc7180.c +0 -0
index 1a3925badd7c..9081649f476f 100644
@@ -491,7 +491,13 @@ static int __init lpass_sc7180_init(void)
        if (ret)

drivers/clk/qcom/lpasscorecc-sc7180.c static int __init lpass_sc7180_init(void) · line 500

Quoted 10 lines
drivers/clk/qcom/lpasscorecc-sc7180.c +7 -1
                return ret;
 
-       return platform_driver_register(&lpass_hm_sc7180_driver);
+       ret = platform_driver_register(&lpass_hm_sc7180_driver);
+       if (ret) {
+               platform_driver_unregister(&lpass_core_cc_sc7180_driver);
+               return ret;
+       }
+
+       return 0;