| Message ID | 20200419031713.24423-1-f.fainelli@gmail.com |
|---|---|
| State | Accepted |
| Delegated to: | David Miller |
| Headers | show |
| Series | [net-next] net: phy: Propagate error from bus->reset | expand |
On Sat, Apr 18, 2020 at 08:17:13PM -0700, Florian Fainelli wrote: > If a bus->reset() call for the mii_bus structure returns an error (e.g.: > -EPROE_DEFER) we should propagate it accordingly. > > Signed-off-by: Florian Fainelli <f.fainelli@gmail.com> Reviewed-by: Andrew Lunn <andrew@lunn.ch> Andrew
From: Florian Fainelli <f.fainelli@gmail.com> Date: Sat, 18 Apr 2020 20:17:13 -0700 > If a bus->reset() call for the mii_bus structure returns an error (e.g.: > -EPROE_DEFER) we should propagate it accordingly. > > Signed-off-by: Florian Fainelli <f.fainelli@gmail.com> Applied, thanks.
diff --git a/drivers/net/phy/mdio_bus.c b/drivers/net/phy/mdio_bus.c index 7a4eb3f2cb74..346e88435d29 100644 --- a/drivers/net/phy/mdio_bus.c +++ b/drivers/net/phy/mdio_bus.c @@ -627,8 +627,11 @@ int __mdiobus_register(struct mii_bus *bus, struct module *owner) gpiod_set_value_cansleep(gpiod, 0); } - if (bus->reset) - bus->reset(bus); + if (bus->reset) { + err = bus->reset(bus); + if (err) + goto error_reset_gpiod; + } for (i = 0; i < PHY_MAX_ADDR; i++) { if ((bus->phy_mask & (1 << i)) == 0) { @@ -657,7 +660,7 @@ int __mdiobus_register(struct mii_bus *bus, struct module *owner) mdiodev->device_remove(mdiodev); mdiodev->device_free(mdiodev); } - +error_reset_gpiod: /* Put PHYs in RESET to save power */ if (bus->reset_gpiod) gpiod_set_value_cansleep(bus->reset_gpiod, 1);
If a bus->reset() call for the mii_bus structure returns an error (e.g.: -EPROE_DEFER) we should propagate it accordingly. Signed-off-by: Florian Fainelli <f.fainelli@gmail.com> --- drivers/net/phy/mdio_bus.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-)