]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
mdio_bus: Fix PTR_ERR() usage after initialization to constant
authorYueHaibing <yuehaibing@huawei.com>
Sat, 16 Feb 2019 02:59:35 +0000 (10:59 +0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 27 Jan 2020 13:50:24 +0000 (14:50 +0100)
[ Upstream commit 780feae7eb69388c8d8b661cda6706b0dc0f642b ]

Fix coccinelle warning:

./drivers/net/phy/mdio_bus.c:51:5-12: ERROR: PTR_ERR applied after initialization to constant on line 44
./drivers/net/phy/mdio_bus.c:52:5-12: ERROR: PTR_ERR applied after initialization to constant on line 44

fix this by using IS_ERR before PTR_ERR

Fixes: bafbdd527d56 ("phylib: Add device reset GPIO support")
Signed-off-by: YueHaibing <yuehaibing@huawei.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/net/phy/mdio_bus.c

index c5588d4508f97877de45b7e7fb78f9cd3116acf4..5c89a310359de7f53fc575929811463a90934e84 100644 (file)
@@ -56,11 +56,12 @@ static int mdiobus_register_gpiod(struct mdio_device *mdiodev)
                gpiod = fwnode_get_named_gpiod(&mdiodev->dev.of_node->fwnode,
                                               "reset-gpios", 0, GPIOD_OUT_LOW,
                                               "PHY reset");
-       if (PTR_ERR(gpiod) == -ENOENT ||
-           PTR_ERR(gpiod) == -ENOSYS)
-               gpiod = NULL;
-       else if (IS_ERR(gpiod))
-               return PTR_ERR(gpiod);
+       if (IS_ERR(gpiod)) {
+               if (PTR_ERR(gpiod) == -ENOENT || PTR_ERR(gpiod) == -ENOSYS)
+                       gpiod = NULL;
+               else
+                       return PTR_ERR(gpiod);
+       }
 
        mdiodev->reset = gpiod;