[PATCH 1/6] rtc: s3c: Jump to central exit point on getting src clock error

2017-06-16 Thread Krzysztof Kozlowski
In other error paths in probe, centralized exit point was used so make
this consistent.

Signed-off-by: Krzysztof Kozlowski 
---
 drivers/rtc/rtc-s3c.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/rtc/rtc-s3c.c b/drivers/rtc/rtc-s3c.c
index d44fb34df8fe..c5aa7a35d07f 100644
--- a/drivers/rtc/rtc-s3c.c
+++ b/drivers/rtc/rtc-s3c.c
@@ -510,8 +510,7 @@ static int s3c_rtc_probe(struct platform_device *pdev)
else
dev_dbg(>dev,
"probe deferred due to missing rtc src 
clk\n");
-   clk_disable_unprepare(info->rtc_clk);
-   return ret;
+   goto err_src_clk;
}
clk_prepare_enable(info->rtc_src_clk);
}
@@ -575,6 +574,7 @@ static int s3c_rtc_probe(struct platform_device *pdev)
 
if (info->data->needs_src_clk)
clk_disable_unprepare(info->rtc_src_clk);
+err_src_clk:
clk_disable_unprepare(info->rtc_clk);
 
return ret;
-- 
2.9.3



[PATCH 1/6] rtc: s3c: Jump to central exit point on getting src clock error

2017-06-16 Thread Krzysztof Kozlowski
In other error paths in probe, centralized exit point was used so make
this consistent.

Signed-off-by: Krzysztof Kozlowski 
---
 drivers/rtc/rtc-s3c.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/rtc/rtc-s3c.c b/drivers/rtc/rtc-s3c.c
index d44fb34df8fe..c5aa7a35d07f 100644
--- a/drivers/rtc/rtc-s3c.c
+++ b/drivers/rtc/rtc-s3c.c
@@ -510,8 +510,7 @@ static int s3c_rtc_probe(struct platform_device *pdev)
else
dev_dbg(>dev,
"probe deferred due to missing rtc src 
clk\n");
-   clk_disable_unprepare(info->rtc_clk);
-   return ret;
+   goto err_src_clk;
}
clk_prepare_enable(info->rtc_src_clk);
}
@@ -575,6 +574,7 @@ static int s3c_rtc_probe(struct platform_device *pdev)
 
if (info->data->needs_src_clk)
clk_disable_unprepare(info->rtc_src_clk);
+err_src_clk:
clk_disable_unprepare(info->rtc_clk);
 
return ret;
-- 
2.9.3