e1000e: fix pci-device enable-counter balance
authorKonstantin Khlebnikov <khlebnikov@openvz.org>
Tue, 5 Mar 2013 09:42:59 +0000 (09:42 +0000)
committerBen Hutchings <ben@decadent.org.uk>
Wed, 20 Mar 2013 15:03:31 +0000 (15:03 +0000)
commite4922fddf907936782d199d2608a52d769a7fc97
tree0ac9baacc9687615d1607488adac88d4b5cb4bdd
parent5369b4e376562673feb5cf0ad7d23e0a64704fb9
e1000e: fix pci-device enable-counter balance

commit 4e0855dff094b0d56d6b5b271e0ce7851cc1e063 upstream.

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>
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>
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
drivers/net/ethernet/intel/e1000e/netdev.c