]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
net: dsa: gswip: Fix copy-paste error in gswip_gphy_fw_probe()
authorWei Yongjun <weiyongjun1@huawei.com>
Sat, 15 Sep 2018 01:33:38 +0000 (01:33 +0000)
committerDavid S. Miller <davem@davemloft.net>
Mon, 17 Sep 2018 15:06:19 +0000 (08:06 -0700)
The return value from of_reset_control_array_get_exclusive() is not
checked correctly. The test is done against a wrong variable. This
patch fix it.

Fixes: 14fceff4771e ("net: dsa: Add Lantiq / Intel DSA driver for vrx200")
Signed-off-by: Wei Yongjun <weiyongjun1@huawei.com>
Acked-by: Hauke Mehrtens <hauke@hauke-m.de>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/dsa/lantiq_gswip.c

index faac359097432a25c55905733fce88f3190c8d99..be1e69911a5552cd7ae458e8bfd7a69c17f3f3d2 100644 (file)
@@ -934,10 +934,10 @@ static int gswip_gphy_fw_probe(struct gswip_priv *priv,
        }
 
        gphy_fw->reset = of_reset_control_array_get_exclusive(gphy_fw_np);
-       if (IS_ERR(priv->gphy_fw)) {
-               if (PTR_ERR(priv->gphy_fw) != -EPROBE_DEFER)
+       if (IS_ERR(gphy_fw->reset)) {
+               if (PTR_ERR(gphy_fw->reset) != -EPROBE_DEFER)
                        dev_err(dev, "Failed to lookup gphy reset\n");
-               return PTR_ERR(priv->gphy_fw);
+               return PTR_ERR(gphy_fw->reset);
        }
 
        return gswip_gphy_fw_load(priv, gphy_fw);