Commit 6e4ff1c9 authored Nov 19, 2019 by Geert Uytterhoeven Committed by David S. Miller Nov 19, 2019

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: 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>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent 2c61e821

drivers/net/phy/mdio_bus.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -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);

Admin message