Commit 6e4ff1c9 authored by Geert Uytterhoeven's avatar Geert Uytterhoeven Committed by David S. Miller

mdio_bus: Fix init if CONFIG_RESET_CONTROLLER=n

Commit 1d463956 ("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: 1d463956 ("mdio_bus: Fix PTR_ERR applied after initialization to constant")
Signed-off-by: default avatarGeert Uytterhoeven <geert+renesas@glider.be>
Cc: YueHaibing <yuehaibing@huawei.com>
Cc: David S. Miller <davem@davemloft.net>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 2c61e821
...@@ -65,7 +65,7 @@ static int mdiobus_register_reset(struct mdio_device *mdiodev) ...@@ -65,7 +65,7 @@ static int mdiobus_register_reset(struct mdio_device *mdiodev)
reset = devm_reset_control_get_exclusive(&mdiodev->dev, reset = devm_reset_control_get_exclusive(&mdiodev->dev,
"phy"); "phy");
if (IS_ERR(reset)) { if (IS_ERR(reset)) {
if (PTR_ERR(reset) == -ENOENT || PTR_ERR(reset) == -ENOSYS) if (PTR_ERR(reset) == -ENOENT || PTR_ERR(reset) == -ENOTSUPP)
reset = NULL; reset = NULL;
else else
return PTR_ERR(reset); return PTR_ERR(reset);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment