From 3c6516c93964fd82d10769f4fac4ebec2cdbb245 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?fran=C3=A7ois=20romieu?= Date: Mon, 8 Nov 2010 13:23:58 +0000 Subject: [PATCH] --- yaml --- r: 222003 b: refs/heads/master c: ea80907ff066edd1dd43c5fe90ae6677d15e6384 h: refs/heads/master i: 222001: 0d461de0ab4136feccbc6ca20eb0b6f5a2f2afad 221999: 024e6af84f759a757e18244eb1547dbf75b760c9 v: v3 --- [refs] | 2 +- trunk/drivers/net/r8169.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index ab7c5b846ec6..f717d005c967 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 53f57357ff0afc37804f4e82ee3123e0c0a2cad6 +refs/heads/master: ea80907ff066edd1dd43c5fe90ae6677d15e6384 diff --git a/trunk/drivers/net/r8169.c b/trunk/drivers/net/r8169.c index 3a0877e0f97c..4c4d16905efb 100644 --- a/trunk/drivers/net/r8169.c +++ b/trunk/drivers/net/r8169.c @@ -846,10 +846,10 @@ static int rtl8169_set_wol(struct net_device *dev, struct ethtool_wolinfo *wol) else tp->features &= ~RTL_FEATURE_WOL; __rtl8169_set_wol(tp, wol->wolopts); - device_set_wakeup_enable(&tp->pci_dev->dev, wol->wolopts); - spin_unlock_irq(&tp->lock); + device_set_wakeup_enable(&tp->pci_dev->dev, wol->wolopts); + return 0; }