[PATCH] mdio_bus: Fix init if CONFIG_RESET_CONTROLLER=n

* [PATCH] mdio_bus: Fix init if CONFIG_RESET_CONTROLLER=n
@ 2019-11-19 11:25 Geert Uytterhoeven
  2019-11-19 18:05 ` Florian Fainelli
  0 siblings, 1 reply; 4+ messages in thread
From: Geert Uytterhoeven @ 2019-11-19 11:25 UTC (permalink / raw)
  To: YueHaibing, David S . Miller, Andrew Lunn, Florian Fainelli,
	Heiner Kallweit
  Cc: netdev, linux-renesas-soc, linux-kernel, Geert Uytterhoeven

Commit 1d4639567d970de0 ("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

Fixes: 1d4639567d970de0 ("mdio_bus: Fix PTR_ERR applied after initialization to constant")
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
---
This is a regression in v5.4-rc8.
Seen on r8a7740/armadillo, r7s72100/rskrza1, and r7s9210/rza2mevb.
---
 drivers/net/phy/mdio_bus.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/net/phy/mdio_bus.c b/drivers/net/phy/mdio_bus.c
index 35876562e32a02ce..dbacb00318775ff1 100644
--- a/drivers/net/phy/mdio_bus.c
+++ b/drivers/net/phy/mdio_bus.c
@@ -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);
-- 
2.17.1


^ permalink raw reply related	[flat|nested] 4+ messages in thread