---

yaml --- r: 361084 b: refs/heads/master c: 4e0855d h: refs/heads/master v: v3
git-mirror · Mar 7, 2013 · 5cd40a1 · 5cd40a1
1 parent 0bf382e
commit 5cd40a1
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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;
 }