Skip to content

Commit

Permalink
net: usb: lan78xx: Improve error handling in WoL operations
Browse files Browse the repository at this point in the history
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>
Signed-off-by: NipaLocal <nipa@local>
  • Loading branch information
olerem authored and NipaLocal committed Dec 17, 2024
1 parent 4eefdc3 commit 83cae5f
Showing 1 changed file with 6 additions and 2 deletions.
8 changes: 6 additions & 2 deletions drivers/net/usb/lan78xx.c
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down Expand Up @@ -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 exit_pm_put;

phy_ethtool_set_wol(netdev->phydev, wol);
ret = phy_ethtool_set_wol(netdev->phydev, wol);

exit_pm_put:
usb_autopm_put_interface(dev->intf);

return ret;
Expand Down

0 comments on commit 83cae5f

Please sign in to comment.