Skip to content

Commit ecec1de

Browse files
quic-varadavinodkoul
authored andcommitted
phy: qcom: m31: Remove unwanted qphy->vreg is NULL check
Fix the following Smatch complaint: drivers/phy/qualcomm/phy-qcom-m31.c:175 m31usb_phy_init() warn: variable dereferenced before check 'qphy->vreg' (see line 167) drivers/phy/qualcomm/phy-qcom-m31.c 166 167 ret = regulator_enable(qphy->vreg); ^^^^^^^^^^ Unchecked dereference 168 if (ret) { 169 dev_err(&phy->dev, "failed to enable regulator, %d\n", ret); 170 return ret; 171 } 172 173 ret = clk_prepare_enable(qphy->clk); 174 if (ret) { 175 if (qphy->vreg) ^^^^^^^^^^ Checked too late 176 regulator_disable(qphy->vreg); 177 dev_err(&phy->dev, "failed to enable cfg ahb clock, %d\n", ret); Since the phy will not get registered if qphy->vreg is NULL, this check is not needed. Reported-by: Dan Carpenter <[email protected]> Closes: https://lore.kernel.org/linux-phy/[email protected]/T/#u Fixes: 08e49af ("phy: qcom: Introduce M31 USB PHY driver") Signed-off-by: Varadarajan Narayanan <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Vinod Koul <[email protected]>
1 parent 6ee8a9a commit ecec1de

File tree

1 file changed

+1
-2
lines changed

1 file changed

+1
-2
lines changed

drivers/phy/qualcomm/phy-qcom-m31.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -172,8 +172,7 @@ static int m31usb_phy_init(struct phy *phy)
172172

173173
ret = clk_prepare_enable(qphy->clk);
174174
if (ret) {
175-
if (qphy->vreg)
176-
regulator_disable(qphy->vreg);
175+
regulator_disable(qphy->vreg);
177176
dev_err(&phy->dev, "failed to enable cfg ahb clock, %d\n", ret);
178177
return ret;
179178
}

0 commit comments

Comments
 (0)