On Fri, 2014-03-14 at 10:07 +0100, Sebastian Hesselbarth wrote: > 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.hesselba...@gmail.com>
Reviewed-by: Ben Hutchings <b...@decadent.org.uk>
> ---
> Cc: David Miller <da...@davemloft.net>
> Cc: Florian Fainelli <f.faine...@gmail.com>
> Cc: Ben Hutchings <b...@decadent.org.uk>
> Cc: net...@vger.kernel.org
> Cc: linux-arm-ker...@lists.infradead.org
> Cc: linux-kernel@vger.kernel.org
> ---
> drivers/net/phy/phy_device.c | 3 +--
> 1 file changed, 1 insertion(+), 2 deletions(-)
>
> diff --git a/drivers/net/phy/phy_device.c b/drivers/net/phy/phy_device.c
> index 4b03e63639b7..7512e28866f1 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;
--
Ben Hutchings
Experience is directly proportional to the value of equipment destroyed.
- Carolyn Scheppner
signature.asc
Description: This is a digitally signed message part
