Commit ed19b86e authored Nov 15, 2016 by Sarangdhar Joshi Committed by Andy Gross Nov 23, 2016

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 <spjoshi@codeaurora.org>
Reviewed-by: Stephen Boyd <sboyd@codeaurora.org>
Acked-by: Bjorn Andersson <bjorn.andersson@linaro.org>
Signed-off-by: Andy Gross <andy.gross@linaro.org>

parent ab0822d5

drivers/firmware/qcom_scm.c

+4 −4

Original line number	Diff line number	Diff line
		@@ -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)
		if (PTR_ERR(scm->core_clk) != -EPROBE_DEFER)
		dev_err(&pdev->dev,
		"failed to acquire core clk\n");
		return PTR_ERR(scm->core_clk);

		scm->core_clk = NULL;
		}
		}