From 3813e27c322461d2f80fa6537034b384269e512e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?fran=C3=A7ois=20romieu?= Date: Tue, 6 Mar 2012 01:14:12 +0000 Subject: [PATCH] --- yaml --- r: 288295 b: refs/heads/master c: 2a15cd2ff488a9fdb55e5e34060f499853b27c77 h: refs/heads/master i: 288293: a801bf8bc38fad85ea7f42a831018e29531396fb 288291: 6eaf41d46f739f1f75fa458f5e2287f5c7c1daac 288287: 5d4ae2c813e24965c237a0d532286e3ed117457a v: v3 --- [refs] | 2 +- trunk/drivers/net/ethernet/realtek/r8169.c | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 6dda6a5eb8a4..96c9e454410e 100644 --- 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 index 1adf17757cea..bbacb3741ec0 100644 --- 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 = {