linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] clk: qcom: lpass-sc7180: Clean up on error in lpass_sc7180_init()
@ 2020-11-13 10:14 Dan Carpenter
  2020-11-13 17:27 ` Doug Anderson
  2020-11-14 17:04 ` Stephen Boyd
  0 siblings, 2 replies; 3+ messages in thread
From: Dan Carpenter @ 2020-11-13 10:14 UTC (permalink / raw)
  To: Andy Gross
  Cc: Bjorn Andersson, Michael Turquette, Stephen Boyd, Taniya Das,
	Douglas Anderson, linux-clk, linux-kernel, kernel-janitors

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

Fixes: 4ee9fe3e292b ("clk: qcom: lpass-sc7180: Disentangle the two clock devices")
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
---
 drivers/clk/qcom/lpasscorecc-sc7180.c | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/drivers/clk/qcom/lpasscorecc-sc7180.c b/drivers/clk/qcom/lpasscorecc-sc7180.c
index 1a3925badd7c..9081649f476f 100644
--- a/drivers/clk/qcom/lpasscorecc-sc7180.c
+++ b/drivers/clk/qcom/lpasscorecc-sc7180.c
@@ -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);
 
-- 
2.28.0


^ permalink raw reply related	[flat|nested] 3+ messages in thread

* Re: [PATCH] clk: qcom: lpass-sc7180: Clean up on error in lpass_sc7180_init()
  2020-11-13 10:14 [PATCH] clk: qcom: lpass-sc7180: Clean up on error in lpass_sc7180_init() Dan Carpenter
@ 2020-11-13 17:27 ` Doug Anderson
  2020-11-14 17:04 ` Stephen Boyd
  1 sibling, 0 replies; 3+ messages in thread
From: Doug Anderson @ 2020-11-13 17:27 UTC (permalink / raw)
  To: Dan Carpenter
  Cc: Andy Gross, Bjorn Andersson, Michael Turquette, Stephen Boyd,
	Taniya Das, linux-clk, LKML, kernel-janitors

Hi,

On Fri, Nov 13, 2020 at 2:14 AM Dan Carpenter <dan.carpenter@oracle.com> wrote:
>
> Clean up the first driver if the second driver can't be registered.
>
> Fixes: 4ee9fe3e292b ("clk: qcom: lpass-sc7180: Disentangle the two clock devices")
> Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
> ---
>  drivers/clk/qcom/lpasscorecc-sc7180.c | 8 +++++++-
>  1 file changed, 7 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/clk/qcom/lpasscorecc-sc7180.c b/drivers/clk/qcom/lpasscorecc-sc7180.c
> index 1a3925badd7c..9081649f476f 100644
> --- a/drivers/clk/qcom/lpasscorecc-sc7180.c
> +++ b/drivers/clk/qcom/lpasscorecc-sc7180.c
> @@ -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;

Reviewed-by: Douglas Anderson <dianders@chromium.org>

^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [PATCH] clk: qcom: lpass-sc7180: Clean up on error in lpass_sc7180_init()
  2020-11-13 10:14 [PATCH] clk: qcom: lpass-sc7180: Clean up on error in lpass_sc7180_init() Dan Carpenter
  2020-11-13 17:27 ` Doug Anderson
@ 2020-11-14 17:04 ` Stephen Boyd
  1 sibling, 0 replies; 3+ messages in thread
From: Stephen Boyd @ 2020-11-14 17:04 UTC (permalink / raw)
  To: Andy Gross, Dan Carpenter
  Cc: Bjorn Andersson, Michael Turquette, Taniya Das, Douglas Anderson,
	linux-clk, linux-kernel, kernel-janitors

Quoting Dan Carpenter (2020-11-13 02:14:19)
> Clean up the first driver if the second driver can't be registered.
> 
> Fixes: 4ee9fe3e292b ("clk: qcom: lpass-sc7180: Disentangle the two clock devices")
> Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
> ---

Applied to clk-next

^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2020-11-14 17:04 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-11-13 10:14 [PATCH] clk: qcom: lpass-sc7180: Clean up on error in lpass_sc7180_init() Dan Carpenter
2020-11-13 17:27 ` Doug Anderson
2020-11-14 17:04 ` Stephen Boyd

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).