diff options
| author | Clark Williams <williams@redhat.com> | 2012-04-14 09:13:39 -0500 |
|---|---|---|
| committer | Clark Williams <williams@redhat.com> | 2012-04-14 09:13:39 -0500 |
| commit | 4905660cd237e4c4ede46920851caa12739f006f (patch) | |
| tree | ef37e7c9f52c9ae9c2b206658556f37d67fe43eb /drivers/net/ethernet/realtek/r8169.c | |
| parent | 1b5e39fc18a1b8ff7ea425ce5f49307cb28a880f (diff) | |
| parent | 0147c2ae9d602b5791dae30322ece475271acd10 (diff) | |
Merge commit 'v3.2.15' into rt-3.2.15-rt24v3.2.15-rt24
Diffstat (limited to 'drivers/net/ethernet/realtek/r8169.c')
| -rw-r--r-- | drivers/net/ethernet/realtek/r8169.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/net/ethernet/realtek/r8169.c b/drivers/net/ethernet/realtek/r8169.c index 0cf2351fbaff..697cae37a10f 100644 --- a/drivers/net/ethernet/realtek/r8169.c +++ b/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 = { |