---

yaml --- r: 288295 b: refs/heads/master c: 2a15cd2 h: refs/heads/master i: 288293: a801bf8 288291: 6eaf41d 288287: 5d4ae2c v: v3
git-mirror · Mar 6, 2012 · 3813e27 · 3813e27
1 parent dc85161
commit 3813e27
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4648dc97af9d496218a05353b0e442b3dfa6aaab
+refs/heads/master: 2a15cd2ff488a9fdb55e5e34060f499853b27c77
diff --git a/trunk/drivers/net/ethernet/realtek/r8169.c b/trunk/drivers/net/ethernet/realtek/r8169.c
@@ -6194,6 +6194,9 @@ static void rtl_shutdown(struct pci_dev *pdev)
 {
 	struct net_device *dev = pci_get_drvdata(pdev);
 	struct rtl8169_private *tp = netdev_priv(dev);
+	struct device *d = &pdev->dev;
+
+	pm_runtime_get_sync(d);
 
 	rtl8169_net_suspend(dev);
 
@@ -6215,6 +6218,8 @@ static void rtl_shutdown(struct pci_dev *pdev)
 		pci_wake_from_d3(pdev, true);
 		pci_set_power_state(pdev, PCI_D3hot);
 	}
+
+	pm_runtime_put_noidle(d);
 }
 
 static struct pci_driver rtl8169_pci_driver = {