Commit 24b41c97 authored Jun 13, 2013 by Dean Nelson Committed by Jeff Kirsher Jul 28, 2013

e1000e: restore call to pci_clear_master()

In attempting to resolve a minor merge conflict, commit e5f2ef7a
(Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

) accidentally
dropped a call to pci_clear_master() that was intended to remain in place.

Commit 4e0855df (e1000e: fix pci-device enable-counter balance)
replaced a call to pci_disable_device() by one to pci_clear_master(). And then
commit 66148bab (e1000e: fix runtime power management transitions)
deleted a number of lines starting two lines following that call.

This patch restores the call to pci_clear_master() in __e1000_shutdown().

v2: added summary lines (enclosed in parens) following commit IDs

Signed-off-by: Dean Nelson <dnelson@redhat.com>
Tested-by: Aaron Brown <aaron.f.brown@intel.com>
Acked-by: Bruce Allan <bruce.w.allan@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>

parent ab90695a

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

+2 −0

Original line number	Diff line number	Diff line
		@@ -5995,6 +5995,8 @@ static int __e1000_shutdown(struct pci_dev *pdev, bool runtime)
		*/
		e1000e_release_hw_control(adapter);

		pci_clear_master(pdev);

		/* The pci-e switch on some quad port adapters will report a
		* correctable error when the MAC transitions from D0 to D3. To
		* prevent this we need to mask off the correctable errors on the