mdio_bus: Fix init if CONFIG_RESET_CONTROLLER=n
authorGeert Uytterhoeven <geert+renesas@glider.be>
Tue, 19 Nov 2019 11:25:24 +0000 (12:25 +0100)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 19 Nov 2019 16:34:15 +0000 (08:34 -0800)
Commit 1d4639567d97 ("mdio_bus: Fix PTR_ERR applied after initialization
to constant") accidentally changed a check from -ENOTSUPP to -ENOSYS,
causing failures if reset controller support is not enabled.  E.g. on
r7s72100/rskrza1:

    sh-eth e8203000.ethernet: MDIO init failed: -524
    sh-eth: probe of e8203000.ethernet failed with error -524

Seen on r8a7740/armadillo, r7s72100/rskrza1, and r7s9210/rza2mevb.

Fixes: 1d4639567d97 ("mdio_bus: Fix PTR_ERR applied after initialization to constant")
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Cc: YueHaibing <yuehaibing@huawei.com>
Cc: David S. Miller <davem@davemloft.net>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
drivers/net/phy/mdio_bus.c

index 3587656..dbacb00 100644 (file)
@@ -65,7 +65,7 @@ static int mdiobus_register_reset(struct mdio_device *mdiodev)
                reset = devm_reset_control_get_exclusive(&mdiodev->dev,
                                                         "phy");
        if (IS_ERR(reset)) {
-               if (PTR_ERR(reset) == -ENOENT || PTR_ERR(reset) == -ENOSYS)
+               if (PTR_ERR(reset) == -ENOENT || PTR_ERR(reset) == -ENOTSUPP)
                        reset = NULL;
                else
                        return PTR_ERR(reset);