| From 17ea17a0e2503b3570d0951b1a3d30bd9cc52f2a Mon Sep 17 00:00:00 2001 |
| From: Geert Uytterhoeven <geert+renesas@glider.be> |
| Date: Tue, 19 Nov 2019 12:25:24 +0100 |
| Subject: [PATCH] mdio_bus: Fix init if CONFIG_RESET_CONTROLLER=n |
| |
| commit fd8f64df95204951c3edd4c4a7817c909d55a100 upstream. |
| |
| 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> |
| Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> |
| |
| diff --git a/drivers/net/phy/mdio_bus.c b/drivers/net/phy/mdio_bus.c |
| index a19890845f62..9fa1c93ece7a 100644 |
| --- a/drivers/net/phy/mdio_bus.c |
| +++ b/drivers/net/phy/mdio_bus.c |
| @@ -69,7 +69,7 @@ static int mdiobus_register_reset(struct mdio_device *mdiodev) |
| reset = of_reset_control_get_exclusive(mdiodev->dev.of_node, |
| "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.27.0 |
| |
