From 5cd40a1456e0b2fb78707620108e8a90366683eb Mon Sep 17 00:00:00 2001
From: Konstantin Khlebnikov <khlebnikov@openvz.org>
Date: Tue, 5 Mar 2013 09:42:59 +0000
Subject: [PATCH] --- yaml --- r: 361084 b: refs/heads/master c:
 4e0855dff094b0d56d6b5b271e0ce7851cc1e063 h: refs/heads/master v: v3

---
 [refs]                                           | 2 +-
 trunk/drivers/net/ethernet/intel/e1000e/netdev.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 7a1e60acbf18..1d9040e44faa 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f8af75f3517a24838a36eb5797a1a3e60bf9e276
+refs/heads/master: 4e0855dff094b0d56d6b5b271e0ce7851cc1e063
diff --git a/trunk/drivers/net/ethernet/intel/e1000e/netdev.c b/trunk/drivers/net/ethernet/intel/e1000e/netdev.c
index a177b8b65c44..1799021944eb 100644
--- a/trunk/drivers/net/ethernet/intel/e1000e/netdev.c
+++ b/trunk/drivers/net/ethernet/intel/e1000e/netdev.c
@@ -5986,7 +5986,7 @@ static int __e1000_shutdown(struct pci_dev *pdev, bool *enable_wake,
 	 */
 	e1000e_release_hw_control(adapter);
 
-	pci_disable_device(pdev);
+	pci_clear_master(pdev);
 
 	return 0;
 }