From 2bcb9a870f8609c855ab9b71a622cd411cfea4cb Mon Sep 17 00:00:00 2001 From: Ming Lei Date: Sat, 19 Jan 2013 01:32:01 +0000 Subject: [PATCH] --- yaml --- r: 351503 b: refs/heads/master c: 4fbc5b20e2715997a1b5e634543e8cac9aa36d4c h: refs/heads/master i: 351501: 65402aec3ac2dbffb315258df401e8c99a765b14 351499: c570bd145dd7d444629df4b45d0eaf4da88d7adb 351495: dc99e2f9b9c390c3325e990edfb1db38d3372976 351487: 21455186d221517bbd9f420a1b2c6d3a638f402c v: v3 --- [refs] | 2 +- trunk/drivers/net/usb/pegasus.c | 8 +++++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index fd82afad7f01..e8b576159986 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 546bfedbe604baeb5a03736593bb95c9aa56bcfa +refs/heads/master: 4fbc5b20e2715997a1b5e634543e8cac9aa36d4c diff --git a/trunk/drivers/net/usb/pegasus.c b/trunk/drivers/net/usb/pegasus.c index 3c02f950a3d2..8ee5ab0db127 100644 --- a/trunk/drivers/net/usb/pegasus.c +++ b/trunk/drivers/net/usb/pegasus.c @@ -1097,6 +1097,7 @@ pegasus_set_wol(struct net_device *dev, struct ethtool_wolinfo *wol) { pegasus_t *pegasus = netdev_priv(dev); u8 reg78 = 0x04; + int ret; if (wol->wolopts & ~WOL_SUPPORTED) return -EINVAL; @@ -1111,7 +1112,12 @@ pegasus_set_wol(struct net_device *dev, struct ethtool_wolinfo *wol) else pegasus->eth_regs[0] &= ~0x10; pegasus->wolopts = wol->wolopts; - return set_register(pegasus, WakeupControl, reg78); + + ret = set_register(pegasus, WakeupControl, reg78); + if (!ret) + ret = device_set_wakeup_enable(&pegasus->usb->dev, + wol->wolopts); + return ret; } static inline void pegasus_reset_wol(struct net_device *dev)