diff options
| author | Dean Nelson <dnelson@redhat.com> | 2013-06-13 03:55:44 +0000 |
|---|---|---|
| committer | Jeff Kirsher <jeffrey.t.kirsher@intel.com> | 2013-07-28 02:34:59 -0700 |
| commit | 24b41c972ce7e0ff5891bfd0bb5b7d34439f297c (patch) | |
| tree | e249535731804f9d1568ef6cbcac98858cc6100a /net/can/bcm.c | |
| parent | ab90695a1a1185e0c5aff04ac16d39c5712f28bd (diff) | |
| download | talos-op-linux-24b41c972ce7e0ff5891bfd0bb5b7d34439f297c.tar.gz talos-op-linux-24b41c972ce7e0ff5891bfd0bb5b7d34439f297c.zip | |
e1000e: restore call to pci_clear_master()
In attempting to resolve a minor merge conflict, commit e5f2ef7ab4690d2e8faa
(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 4e0855dff094b0d56d6b (e1000e: fix pci-device enable-counter balance)
replaced a call to pci_disable_device() by one to pci_clear_master(). And then
commit 66148babe728f3e00e13 (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>
Diffstat (limited to 'net/can/bcm.c')
0 files changed, 0 insertions, 0 deletions
