]> Git Repo - linux.git/commitdiff
phy: qcom: m31: Remove unwanted qphy->vreg is NULL check
authorVaradarajan Narayanan <[email protected]>
Thu, 7 Sep 2023 06:50:52 +0000 (12:20 +0530)
committerVinod Koul <[email protected]>
Thu, 21 Sep 2023 14:18:22 +0000 (16:18 +0200)
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: 08e49af50701 ("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]>
drivers/phy/qualcomm/phy-qcom-m31.c

index 014278e5428c9c93c923b9e10729b151e9a73b83..5cb7e79b99b3f5622d47fe77b7a0e36187a551af 100644 (file)
@@ -172,8 +172,7 @@ static int m31usb_phy_init(struct phy *phy)
 
        ret = clk_prepare_enable(qphy->clk);
        if (ret) {
-               if (qphy->vreg)
-                       regulator_disable(qphy->vreg);
+               regulator_disable(qphy->vreg);
                dev_err(&phy->dev, "failed to enable cfg ahb clock, %d\n", ret);
                return ret;
        }
This page took 0.058174 seconds and 4 git commands to generate.