From: spjoshi@codeaurora.org Date: Wed, 16 Nov 2016 01:19:25 +0000 (-0800) Subject: firmware: qcom: scm: Return PTR_ERR when devm_clk_get fails X-Git-Tag: rel_imx_4.19.35_1.1.0~13515^2^2 X-Git-Url: https://git.somdevices.com/?a=commitdiff_plain;h=ed19b86e817c5f30d557042f2e8ab68dc93940d4;p=linux.git firmware: qcom: scm: Return PTR_ERR when devm_clk_get fails 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 Reviewed-by: Stephen Boyd Acked-by: Bjorn Andersson Signed-off-by: Andy Gross --- diff --git a/drivers/firmware/qcom_scm.c b/drivers/firmware/qcom_scm.c index 7a104d31ef0f..893f953eaccf 100644 --- a/drivers/firmware/qcom_scm.c +++ b/drivers/firmware/qcom_scm.c @@ -338,10 +338,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); } }