diff options
| author | Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com> | 2014-03-14 10:07:44 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-03-15 03:38:54 +0100 |
| commit | 32fc3fd41ae44a41ffb8fd5ec4f4764822104655 (patch) | |
| tree | 5ffde54cb5f9c23de3b81f8afd37aec09885c248 /drivers | |
| parent | MAINTAINERS: Add linux.nics@intel.com to INTEL ETHERNET DRIVERS (diff) | |
| download | linux-32fc3fd41ae44a41ffb8fd5ec4f4764822104655.tar.xz linux-32fc3fd41ae44a41ffb8fd5ec4f4764822104655.zip | |
net: phy: fix uninitalized ethtool_wolinfo in phy_suspend
Callers of phy_ethtool_get_wol are supposed to provide a properly
cleared struct ethtool_wolinfo. Therefore, fix phy_suspend to clear
it before passing it to phy_ethtool_get_wol.
Signed-off-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
Reviewed-by: Ben Hutchings <ben@decadent.org.uk>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/net/phy/phy_device.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/net/phy/phy_device.c b/drivers/net/phy/phy_device.c index 4b970f7624c0..2f6989b1e0dc 100644 --- a/drivers/net/phy/phy_device.c +++ b/drivers/net/phy/phy_device.c @@ -683,10 +683,9 @@ EXPORT_SYMBOL(phy_detach); int phy_suspend(struct phy_device *phydev) { struct phy_driver *phydrv = to_phy_driver(phydev->dev.driver); - struct ethtool_wolinfo wol; + struct ethtool_wolinfo wol = { .cmd = ETHTOOL_GWOL }; /* If the device has WOL enabled, we cannot suspend the PHY */ - wol.cmd = ETHTOOL_GWOL; phy_ethtool_get_wol(phydev, &wol); if (wol.wolopts) return -EBUSY; |