Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1523171
| From | Sarangdhar Joshi <spjoshi@codeaurora.org> |
|---|---|
| Newsgroups | linux.kernel |
| Subject | [PATCH v3 3/3] firmware: qcom: scm: Return PTR_ERR when devm_clk_get fails |
| Date | 2016-11-16 02:30 +0100 |
| Message-ID | <sDXd0-4d8-1@gated-at.bofh.it> (permalink) |
| References | <sDX3j-4a1-5@gated-at.bofh.it> |
| Organization | linux.* mail to news gateway |
When devm_clk_get fails for core clock, the failure was ignored
and the core_clk was explicitly set to NULL so that other
remaining clocks can be queried. However, now that we have a
cleaner way of expressing the clock dependency, return failure
when devm_clk_get fails for core clock.
Signed-off-by: Sarangdhar Joshi <spjoshi@codeaurora.org>
---
drivers/firmware/qcom_scm.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/firmware/qcom_scm.c b/drivers/firmware/qcom_scm.c
index ddf7c8b..0fbf2ea 100644
--- a/drivers/firmware/qcom_scm.c
+++ b/drivers/firmware/qcom_scm.c
@@ -395,10 +395,10 @@ static int qcom_scm_probe(struct platform_device *pdev)
if (clks & SCM_HAS_CORE_CLK) {
scm->core_clk = devm_clk_get(&pdev->dev, "core");
if (IS_ERR(scm->core_clk)) {
- if (PTR_ERR(scm->core_clk) == -EPROBE_DEFER)
- return PTR_ERR(scm->core_clk);
-
- scm->core_clk = NULL;
+ if (PTR_ERR(scm->core_clk) != -EPROBE_DEFER)
+ dev_err(&pdev->dev,
+ "failed to acquire core clk\n");
+ return PTR_ERR(scm->core_clk);
}
}
--
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
a Linux Foundation Collaborative Project
Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread
[PATCH v3 0/3] Remove clocks dependency from SCM driver Sarangdhar Joshi <spjoshi@codeaurora.org> - 2016-11-16 02:20 +0100
[PATCH v3 1/3] dt-bindings: firmware: scm: Add MSM8996 DT bindings Sarangdhar Joshi <spjoshi@codeaurora.org> - 2016-11-16 02:20 +0100
Re: [PATCH v3 1/3] dt-bindings: firmware: scm: Add MSM8996 DT bindings Stephen Boyd <sboyd@codeaurora.org> - 2016-11-18 00:20 +0100
Re: [PATCH v3 1/3] dt-bindings: firmware: scm: Add MSM8996 DT bindings Bjorn Andersson <bjorn.andersson@linaro.org> - 2016-11-18 21:00 +0100
[PATCH v3 3/3] firmware: qcom: scm: Return PTR_ERR when devm_clk_get fails Sarangdhar Joshi <spjoshi@codeaurora.org> - 2016-11-16 02:30 +0100
Re: [PATCH v3 3/3] firmware: qcom: scm: Return PTR_ERR when devm_clk_get fails Stephen Boyd <sboyd@codeaurora.org> - 2016-11-18 00:20 +0100
Re: [PATCH v3 3/3] firmware: qcom: scm: Return PTR_ERR when devm_clk_get fails Bjorn Andersson <bjorn.andersson@linaro.org> - 2016-11-18 21:10 +0100
[PATCH v3 2/3] firmware: qcom: scm: Remove core, iface and bus clocks dependency Sarangdhar Joshi <spjoshi@codeaurora.org> - 2016-11-16 02:30 +0100
Re: [PATCH v3 2/3] firmware: qcom: scm: Remove core, iface and bus clocks dependency Stephen Boyd <sboyd@codeaurora.org> - 2016-11-18 00:20 +0100
Re: [PATCH v3 2/3] firmware: qcom: scm: Remove core, iface and bus clocks dependency Bjorn Andersson <bjorn.andersson@linaro.org> - 2016-11-18 21:00 +0100
csiph-web