Skip to content
Commit 24b41c97 authored by Dean Nelson's avatar Dean Nelson Committed by Jeff Kirsher
Browse files

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: default avatarDean Nelson <dnelson@redhat.com>
Tested-by: default avatarAaron Brown <aaron.f.brown@intel.com>
Acked-by: default avatarBruce Allan <bruce.w.allan@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent ab90695a
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment