diff options
| author | David S. Miller <davem@davemloft.net> | 2014-03-25 20:29:20 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-03-25 20:29:20 -0400 |
| commit | 04f58c88542b6b351efb4eea01134eb672e22e6e (patch) | |
| tree | 47bb617212f8c8951f35730e324bdc43487a01ca /drivers/net/phy | |
| parent | 0fc31966035d7a540c011b6c967ce8eae1db121b (diff) | |
| parent | 632b06aa2842b12c6d6a510ec080fb6ebdb38ea5 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
Documentation/devicetree/bindings/net/micrel-ks8851.txt
net/core/netpoll.c
The net/core/netpoll.c conflict is a bug fix in 'net' happening
to code which is completely removed in 'net-next'.
In micrel-ks8851.txt we simply have overlapping changes.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/phy')
| -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 a2fbb3e1db9a..0ce606624296 100644 --- a/drivers/net/phy/phy_device.c +++ b/drivers/net/phy/phy_device.c @@ -684,10 +684,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; |