| commit | 4e0855dff094b0d56d6b5b271e0ce7851cc1e063 | |
| author | Konstantin Khlebnikov <khlebnikov@openvz.org> | |
| Tue, 5 Mar 2013 09:42:59 +0000 (5 09:42 +0000) | ||
| committer | Jeff Kirsher <jeffrey.t.kirsher@intel.com> | |
| Thu, 7 Mar 2013 10:27:25 +0000 (7 02:27 -0800) | ||
| tree | 7ec59b0d2de3be9f29a8c1cda0bb09a93ead6d42 | treesnapshot (tar.gz zip) |
| parent | f8af75f3517a24838a36eb5797a1a3e60bf9e276 | commitdiff |
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 23606cf5d1192c2b17912cb2ef6e62f9b11de133
("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>
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 23606cf5d1192c2b17912cb2ef6e62f9b11de133
("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>
| drivers/net/ethernet/intel/e1000e/netdev.c | diffblobblamehistory |