Messages in this thread Patch in this message | | | Subject | [PATCH 2/5] e1000e: fix pci device enable counter balance | From | Konstantin Khlebnikov <> | Date | Fri, 18 Jan 2013 15:42:18 +0400 |
| |
__e1000_shutdown() calls pci_disable_device() at the end, thus __e1000_resume() should call pci_enable_device_mem() to keep enable counter in balance.
Bug was introduced in commit 23606cf5d1192c2b17912cb2ef6e62f9b11de133 ("e1000e / PCI / PM: Add basic runtime PM support (rev. 4)") in v2.6.35
Signed-off-by: Konstantin Khlebnikov <khlebnikov@openvz.org> Cc: e1000-devel@lists.sourceforge.net Cc: Jeff Kirsher <jeffrey.t.kirsher@intel.com> Cc: Bruce Allan <bruce.w.allan@intel.com> --- drivers/net/ethernet/intel/e1000e/netdev.c | 7 +++++++ 1 file changed, 7 insertions(+)
diff --git a/drivers/net/ethernet/intel/e1000e/netdev.c b/drivers/net/ethernet/intel/e1000e/netdev.c index 2853c11..6bce796 100644 --- a/drivers/net/ethernet/intel/e1000e/netdev.c +++ b/drivers/net/ethernet/intel/e1000e/netdev.c @@ -5598,6 +5598,13 @@ static int __e1000_resume(struct pci_dev *pdev) pci_restore_state(pdev); pci_save_state(pdev); + err = pci_enable_device_mem(pdev); + if (err) { + dev_err(&pdev->dev, + "Cannot re-enable PCI device after suspend.\n"); + return err; + } + e1000e_set_interrupt_capability(adapter); if (netif_running(netdev)) { err = e1000_request_irq(adapter);
| |