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;
 }