| Message ID | 20241209130751.703182-12-o.rempel@pengutronix.de (mailing list archive) |
|---|---|
| State | Superseded |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | lan78xx: Preparations for PHYlink | expand |
On Mon, Dec 09, 2024 at 02:07:51PM +0100, Oleksij Rempel wrote: > Enhance error handling in Wake-on-LAN (WoL) operations: > - Log a warning in `lan78xx_get_wol` if `lan78xx_read_reg` fails. > - Check and handle errors from `device_set_wakeup_enable` and > `phy_ethtool_set_wol` in `lan78xx_set_wol`. > - Ensure proper cleanup with a unified error handling path. > > Signed-off-by: Oleksij Rempel <o.rempel@pengutronix.de> Reviewed-by: Andrew Lunn <andrew@lunn.ch> Andrew
On Mon, 9 Dec 2024 14:07:51 +0100 Oleksij Rempel wrote: > +set_wol_done: exit_pm_put: ? > usb_autopm_put_interface(dev->intf);
diff --git a/drivers/net/usb/lan78xx.c b/drivers/net/usb/lan78xx.c index 0403aea1a9fa..99c19ec1cb88 100644 --- a/drivers/net/usb/lan78xx.c +++ b/drivers/net/usb/lan78xx.c @@ -1857,6 +1857,7 @@ static void lan78xx_get_wol(struct net_device *netdev, ret = lan78xx_read_reg(dev, USB_CFG0, &buf); if (unlikely(ret < 0)) { + netdev_warn(dev->net, "failed to get WoL %pe", ERR_PTR(ret)); wol->supported = 0; wol->wolopts = 0; } else { @@ -1888,10 +1889,13 @@ static int lan78xx_set_wol(struct net_device *netdev, pdata->wol = wol->wolopts; - device_set_wakeup_enable(&dev->udev->dev, (bool)wol->wolopts); + ret = device_set_wakeup_enable(&dev->udev->dev, (bool)wol->wolopts); + if (ret < 0) + goto set_wol_done; - phy_ethtool_set_wol(netdev->phydev, wol); + ret = phy_ethtool_set_wol(netdev->phydev, wol); +set_wol_done: usb_autopm_put_interface(dev->intf); return ret;
Enhance error handling in Wake-on-LAN (WoL) operations: - Log a warning in `lan78xx_get_wol` if `lan78xx_read_reg` fails. - Check and handle errors from `device_set_wakeup_enable` and `phy_ethtool_set_wol` in `lan78xx_set_wol`. - Ensure proper cleanup with a unified error handling path. Signed-off-by: Oleksij Rempel <o.rempel@pengutronix.de> --- drivers/net/usb/lan78xx.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)