Patchwork [3.5.y.z,extended,stable] Patch "e1000e: fix pci-device enable-counter balance" has been added to staging queue

mail settings
Submitter Luis Henriques
Date March 12, 2013, 2:29 p.m.
Message ID <>
Download mbox | patch
Permalink /patch/227035/
State New
Headers show


Luis Henriques - March 12, 2013, 2:29 p.m.
This is a note to let you know that I have just added a patch titled

    e1000e: fix pci-device enable-counter balance

to the linux-3.5.y-queue branch of the 3.5.y.z extended stable tree 
which can be found at:;a=shortlog;h=refs/heads/linux-3.5.y-queue

If you, or anyone else, feels it should not be added to this tree, please 
reply to this email.

For more information about the 3.5.y.z tree, see



From 9842a92d6379cace02f957986fc661e085ac09f7 Mon Sep 17 00:00:00 2001
From: Konstantin Khlebnikov <>
Date: Tue, 5 Mar 2013 09:42:59 +0000
Subject: [PATCH] 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 <>
Signed-off-by: Konstantin Khlebnikov <>
Acked-by: Rafael J. Wysocki <>
Tested-by: Borislav Petkov <>
Tested-by: Aaron Brown <>
Signed-off-by: Jeff Kirsher <>
Signed-off-by: Luis Henriques <>
 drivers/net/ethernet/intel/e1000e/netdev.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)



diff --git a/drivers/net/ethernet/intel/e1000e/netdev.c b/drivers/net/ethernet/intel/e1000e/netdev.c
index 2c78ef0..2ea52ce 100644
--- a/drivers/net/ethernet/intel/e1000e/netdev.c
+++ b/drivers/net/ethernet/intel/e1000e/netdev.c
@@ -5560,7 +5560,7 @@  static int __e1000_shutdown(struct pci_dev *pdev, bool *enable_wake,

-	pci_disable_device(pdev);
+	pci_clear_master(pdev);

 	return 0;