From bc9425f89ee57633e1af02af0577c4a3f728d415 Mon Sep 17 00:00:00 2001 From: "Rafael J. Wysocki" Date: Tue, 9 Nov 2010 11:54:19 +0000 Subject: [PATCH] --- yaml --- r: 222055 b: refs/heads/master c: 6c4f199411f254bf3713b04ed8653f0955883309 h: refs/heads/master i: 222053: 6719cb13582309dba6b2eac2dee79857ac423f7d 222051: e972987ee3c1b9ee9db3f1b5e2fd0bfe8de51073 222047: 26c0d4a5f3dc79b2a5ae83307751ebabd414eac0 v: v3 --- [refs] | 2 +- trunk/drivers/net/gianfar_ethtool.c | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 2e1713c739a5..5f4cd2546090 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 403856532734317d25ec86ab1e75b8133db7acc6 +refs/heads/master: 6c4f199411f254bf3713b04ed8653f0955883309 diff --git a/trunk/drivers/net/gianfar_ethtool.c b/trunk/drivers/net/gianfar_ethtool.c index 5c566ebc54b8..3bc8e276ba4d 100644 --- a/trunk/drivers/net/gianfar_ethtool.c +++ b/trunk/drivers/net/gianfar_ethtool.c @@ -635,9 +635,10 @@ static int gfar_set_wol(struct net_device *dev, struct ethtool_wolinfo *wol) if (wol->wolopts & ~WAKE_MAGIC) return -EINVAL; + device_set_wakeup_enable(&dev->dev, wol->wolopts & WAKE_MAGIC); + spin_lock_irqsave(&priv->bflock, flags); - priv->wol_en = wol->wolopts & WAKE_MAGIC ? 1 : 0; - device_set_wakeup_enable(&dev->dev, priv->wol_en); + priv->wol_en = !!device_may_wakeup(&dev->dev); spin_unlock_irqrestore(&priv->bflock, flags); return 0;