The MDIO write helper currently discards register access errors,
and the MDIO bus callback consequently reports success even when
a write fails.
Return the error from the helper and propagate it through the
MDIO bus callback. Continue treating -ENODEV as success during
device disconnect, consistent with the MDIO read path.
Fixes: 05b35e7eb9a1 ("smsc95xx: add phylib support")
Signed-off-by: Artem Novak <redacted>
---
drivers/net/usb/smsc95xx.c | 13 +++++++++----
1 file changed, 9 insertions(+), 4 deletions(-)
diff --git a/drivers/net/usb/smsc95xx.c b/drivers/net/usb/smsc95xx.c
index f85ee5f8a539..52035c160f4b 100644
--- a/drivers/net/usb/smsc95xx.c
+++ b/drivers/net/usb/smsc95xx.c
@@ -215,8 +215,8 @@ static int smsc95xx_mdio_read(struct usbnet *dev, int phy_id, int idx)
return ret;
}
-static void smsc95xx_mdio_write(struct usbnet *dev, int phy_id, int idx,
- int regval)
+static int smsc95xx_mdio_write(struct usbnet *dev, int phy_id, int idx,
+ int regval)
{
u32 val, addr;
int ret;@@ -255,6 +255,12 @@ static void smsc95xx_mdio_write(struct usbnet *dev, int phy_id, int idx,
done:
mutex_unlock(&dev->phy_mutex);
+
+ /* Ignore -ENODEV error during disconnect() */
+ if (ret == -ENODEV)
+ return 0;
+
+ return ret;
}
static int smsc95xx_mdiobus_reset(struct mii_bus *bus)
@@ -306,8 +312,7 @@ static int smsc95xx_mdiobus_write(struct mii_bus *bus, int phy_id, int idx,
{
struct usbnet *dev = bus->priv;
- smsc95xx_mdio_write(dev, phy_id, idx, regval);
- return 0;
+ return smsc95xx_mdio_write(dev, phy_id, idx, regval);
}
static int __must_check smsc95xx_wait_eeprom(struct usbnet *dev)--
2.56.0