]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
net: usb: lan78xx: Improve error handling in lan78xx_phy_wait_not_busy
authorOleksij Rempel <o.rempel@pengutronix.de>
Mon, 9 Dec 2024 13:07:49 +0000 (14:07 +0100)
committerJakub Kicinski <kuba@kernel.org>
Wed, 11 Dec 2024 02:50:58 +0000 (18:50 -0800)
Update `lan78xx_phy_wait_not_busy` to forward errors from
`lan78xx_read_reg` instead of overwriting them with `-EIO`. Replace
`-EIO` with `-ETIMEDOUT` for timeout cases, providing more specific and
appropriate error codes.

Signed-off-by: Oleksij Rempel <o.rempel@pengutronix.de>
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Link: https://patch.msgid.link/20241209130751.703182-10-o.rempel@pengutronix.de
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
drivers/net/usb/lan78xx.c

index 71f8176210c93b3e6fb74ccd18dfbf876a5d6964..7e7407748426d98c09313ffbfb54735a3c3a93bd 100644 (file)
@@ -963,14 +963,14 @@ static int lan78xx_phy_wait_not_busy(struct lan78xx_net *dev)
 
        do {
                ret = lan78xx_read_reg(dev, MII_ACC, &val);
-               if (unlikely(ret < 0))
-                       return -EIO;
+               if (ret < 0)
+                       return ret;
 
                if (!(val & MII_ACC_MII_BUSY_))
                        return 0;
        } while (!time_after(jiffies, start_time + HZ));
 
-       return -EIO;
+       return -ETIMEDOUT;
 }
 
 static inline u32 mii_access(int id, int index, int read)