[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-ID: <20230823194202.2280957-1-harshit.m.mogalapalli@oracle.com>
Date: Wed, 23 Aug 2023 12:42:02 -0700
From: Harshit Mogalapalli <harshit.m.mogalapalli@...cle.com>
To: dmitry.baryshkov@...aro.org,
Loic Poulain <loic.poulain@...aro.org>,
Robert Foss <rfoss@...nel.org>,
Andi Shyti <andi.shyti@...nel.org>,
Liao Chang <liaochang1@...wei.com>,
Todor Tomov <todor.too@...il.com>,
Bjorn Andersson <andersson@...nel.org>,
Vinod Koul <vkoul@...nel.org>, Wolfram Sang <wsa@...nel.org>,
linux-i2c@...r.kernel.org, linux-arm-msm@...r.kernel.org,
linux-kernel@...r.kernel.org
Cc: dan.carpenter@...aro.org, kernel-janitors@...r.kernel.org,
error27@...il.com, harshit.m.mogalapalli@...cle.com,
vegard.nossum@...cle.com
Subject: [PATCH next] i2c: qcom-cci: Fix error checking in cci_probe()
devm_clk_bulk_get_all() can return zero when no clocks are obtained.
Passing zero to dev_err_probe() is a success which is incorrect.
Fixes: 605efbf43813 ("i2c: qcom-cci: Use dev_err_probe in probe function")
Signed-off-by: Harshit Mogalapalli <harshit.m.mogalapalli@...cle.com>
---
Only compile tested, found by static analysis with smatch.
https://lore.kernel.org/all/CAA8EJprTOjbOy7N5+8NiJaNNhK+_btdUUFcpHKPkMuCZj5umMA@mail.gmail.com/
^^ I reported initially here, Dmitry suggested we need to fix it in a
different patch.
the Fixes commit used above pointed this bug, but the real fixes tag is this:
Fixes: e517526195de ("i2c: Add Qualcomm CCI I2C driver")
---
drivers/i2c/busses/i2c-qcom-cci.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/drivers/i2c/busses/i2c-qcom-cci.c b/drivers/i2c/busses/i2c-qcom-cci.c
index cf13abec05f1..414882c57d7f 100644
--- a/drivers/i2c/busses/i2c-qcom-cci.c
+++ b/drivers/i2c/busses/i2c-qcom-cci.c
@@ -588,8 +588,10 @@ static int cci_probe(struct platform_device *pdev)
/* Clocks */
ret = devm_clk_bulk_get_all(dev, &cci->clocks);
- if (ret < 1)
+ if (ret < 0)
return dev_err_probe(dev, ret, "failed to get clocks\n");
+ else if (!ret)
+ return dev_err_probe(dev, -EINVAL, "not enough clocks in DT\n");
cci->nclocks = ret;
/* Retrieve CCI clock rate */
--
2.39.3
Powered by blists - more mailing lists