From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Mon, 11 Mar 2013 20:54:00 +0000 (-0700)
Subject: 3.4-stable patches
X-Git-Tag: v3.8.3~23
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=9fb4f01dd097b67663ad8b6faa04d3fcb6e6c838;p=thirdparty%2Fkernel%2Fstable-queue.git

3.4-stable patches

added patches:
	e1000e-fix-pci-device-enable-counter-balance.patch
---

diff --git a/queue-3.4/e1000e-fix-pci-device-enable-counter-balance.patch b/queue-3.4/e1000e-fix-pci-device-enable-counter-balance.patch
new file mode 100644
index 00000000000..e54e80bd9d8
--- /dev/null
+++ b/queue-3.4/e1000e-fix-pci-device-enable-counter-balance.patch
@@ -0,0 +1,39 @@
+From 4e0855dff094b0d56d6b5b271e0ce7851cc1e063 Mon Sep 17 00:00:00 2001
+From: Konstantin Khlebnikov <khlebnikov@openvz.org>
+Date: Tue, 5 Mar 2013 09:42:59 +0000
+Subject: e1000e: fix pci-device enable-counter balance
+
+From: Konstantin Khlebnikov <khlebnikov@openvz.org>
+
+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
+
+Signed-off-by: Konstantin Khlebnikov <khlebnikov@openvz.org>
+Cc: Bruce Allan <bruce.w.allan@intel.com>
+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: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/net/ethernet/intel/e1000e/netdev.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/drivers/net/ethernet/intel/e1000e/netdev.c
++++ b/drivers/net/ethernet/intel/e1000e/netdev.c
+@@ -5535,7 +5535,7 @@ static int __e1000_shutdown(struct pci_d
+ 	 */
+ 	e1000e_release_hw_control(adapter);
+ 
+-	pci_disable_device(pdev);
++	pci_clear_master(pdev);
+ 
+ 	return 0;
+ }
diff --git a/queue-3.4/series b/queue-3.4/series
index 76f6a797fa6..43a5f4ab065 100644
--- a/queue-3.4/series
+++ b/queue-3.4/series
@@ -23,3 +23,4 @@ drm-radeon-add-primary-dac-adj-quirk-for-r200-board.patch
 arm-7663-1-perf-fix-armv7-evtype_mask-to-include-nsh-bit.patch
 alsa-ice1712-initialize-card-private_data-properly.patch
 alsa-vmaster-fix-slave-change-notification.patch
+e1000e-fix-pci-device-enable-counter-balance.patch