Commit 4e0855df authored Mar 05, 2013 by Konstantin Khlebnikov Committed by Jeff Kirsher Mar 07, 2013

e1000e: fix pci-device enable-counter balance



This patch removes redundant and unbalanced pci_disable_device() from
__e1000_shutdown(). pci_clear_master() is enough, device can go into
suspended state with elevated enable_cnt.

Bug was introduced in commit 23606cf5
("e1000e / PCI / PM: Add basic runtime PM support (rev. 4)") in v2.6.35

Cc: Bruce Allan <bruce.w.allan@intel.com>
CC: Stable <stable@kernel.org>
Signed-off-by: Konstantin Khlebnikov <khlebnikov@openvz.org>
Acked-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Tested-by: Borislav Petkov <bp@suse.de>
Tested-by: Aaron Brown <aaron.f.brown@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>

parent f8af75f3

drivers/net/ethernet/intel/e1000e/netdev.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -5986,7 +5986,7 @@ static int __e1000_shutdown(struct pci_dev pdev, bool enable_wake,
		*/
		e1000e_release_hw_control(adapter);

		pci_disable_device(pdev);
		pci_clear_master(pdev);

		return 0;
		}