---

yaml --- r: 1366 b: refs/heads/master c: a4cb847 h: refs/heads/master v: v3
git-mirror · May 13, 2005 · 3c44eff · 3c44eff
1 parent e5d5dfe
commit 3c44eff
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6d9157577d926d2a83fe8d4914c0cc216deb5842
+refs/heads/master: a4cb847dac40577dd751a4deb4085ed080780679
diff --git a/trunk/drivers/net/e1000/e1000_main.c b/trunk/drivers/net/e1000/e1000_main.c
@@ -3173,8 +3173,7 @@ e1000_resume(struct pci_dev *pdev)
 	pci_set_power_state(pdev, 0);
 	pci_restore_state(pdev);
 	ret = pci_enable_device(pdev);
-	if (pdev->is_busmaster)
-		pci_set_master(pdev);
+	pci_set_master(pdev);
 
 	pci_enable_wake(pdev, 3, 0);
 	pci_enable_wake(pdev, 4, 0); /* 4 == D3 cold */