Skip to content

Commit 2fe5844

Browse files
Dan Carpentergregkh
authored andcommitted
clk: qcom: common: Fix NULL vs IS_ERR() check in qcom_cc_icc_register()
[ Upstream commit 1e50f5c ] The devm_clk_hw_get_clk() function doesn't return NULL, it returns error pointers. Update the checking to match. Fixes: 8737ec8 ("clk: qcom: common: Add interconnect clocks support") Signed-off-by: Dan Carpenter <dan.carpenter@linaro.org> Reviewed-by: Imran Shaik <imran.shaik@oss.qualcomm.com> Reviewed-by: Konrad Dybcio <konrad.dybcio@oss.qualcomm.com> Reviewed-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org> Link: https://lore.kernel.org/r/aLaPwL2gFS85WsfD@stanley.mountain Signed-off-by: Bjorn Andersson <andersson@kernel.org> Signed-off-by: Sasha Levin <sashal@kernel.org>
1 parent 535e310 commit 2fe5844

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

drivers/clk/qcom/common.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -273,8 +273,8 @@ static int qcom_cc_icc_register(struct device *dev,
273273
icd[i].slave_id = desc->icc_hws[i].slave_id;
274274
hws = &desc->clks[desc->icc_hws[i].clk_id]->hw;
275275
icd[i].clk = devm_clk_hw_get_clk(dev, hws, "icc");
276-
if (!icd[i].clk)
277-
return dev_err_probe(dev, -ENOENT,
276+
if (IS_ERR(icd[i].clk))
277+
return dev_err_probe(dev, PTR_ERR(icd[i].clk),
278278
"(%d) clock entry is null\n", i);
279279
icd[i].name = clk_hw_get_name(hws);
280280
}

0 commit comments

Comments
 (0)