diff options
| author |   YueHaibing <yuehaibing@huawei.com> | 2019-11-11 15:13:47 +0800 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2019-11-11 22:00:53 -0800 |
| commit | 1d4639567d970de087a893521f7f50a32740b595 (patch) | |
| tree | 381b327fceaa64f8d86295b507a1aa13cab7cb0c /drivers/net/phy/mdio_bus.c | |
| parent | NFC: nxp-nci: Fix NULL pointer dereference after I2C communication error (diff) | |
| download | linux-dev-1d4639567d970de087a893521f7f50a32740b595.tar.xz linux-dev-1d4639567d970de087a893521f7f50a32740b595.zip | |
mdio_bus: Fix PTR_ERR applied after initialization to constant
Fix coccinelle warning:
./drivers/net/phy/mdio_bus.c:67:5-12: ERROR: PTR_ERR applied after initialization to constant on line 62
./drivers/net/phy/mdio_bus.c:68:5-12: ERROR: PTR_ERR applied after initialization to constant on line 62
Fix this by using IS_ERR before PTR_ERR
Reported-by: Hulk Robot <hulkci@huawei.com>
Fixes: 71dd6c0dff51 ("net: phy: add support for reset-controller")
Signed-off-by: YueHaibing <yuehaibing@huawei.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to '')
| -rw-r--r-- | drivers/net/phy/mdio_bus.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/drivers/net/phy/mdio_bus.c b/drivers/net/phy/mdio_bus.c index 2e29ab841b4d..35876562e32a 100644 --- a/drivers/net/phy/mdio_bus.c +++ b/drivers/net/phy/mdio_bus.c @@ -64,11 +64,12 @@ static int mdiobus_register_reset(struct mdio_device *mdiodev) if (mdiodev->dev.of_node) reset = devm_reset_control_get_exclusive(&mdiodev->dev, "phy"); - if (PTR_ERR(reset) == -ENOENT || - PTR_ERR(reset) == -ENOTSUPP) - reset = NULL; - else if (IS_ERR(reset)) - return PTR_ERR(reset); + if (IS_ERR(reset)) { + if (PTR_ERR(reset) == -ENOENT || PTR_ERR(reset) == -ENOSYS) + reset = NULL; + else + return PTR_ERR(reset); + } mdiodev->reset_ctrl = reset; |