---

yaml --- r: 42063 b: refs/heads/master c: ef9467f h: refs/heads/master i: 42061: fba94b3 42059: 1085d3a 42055: 51c21dc 42047: 51fb840 v: v3
git-mirror · Dec 4, 2006 · 4bd3127 · 4bd3127
1 parent ede3a2a
commit 4bd3127
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 83ac58ba0a26228c0b16baa2c4b821de9c4ad5ca
+refs/heads/master: ef9467f8f0803881d6b20ad6f0f770fc39bcc2c2
diff --git a/trunk/drivers/net/sunhme.c b/trunk/drivers/net/sunhme.c
@@ -3012,6 +3012,11 @@ static int __devinit happy_meal_pci_probe(struct pci_dev *pdev,
 #endif
 
 	err = -ENODEV;
+
+	if (pci_enable_device(pdev))
+		goto err_out;
+	pci_set_master(pdev);
+
 	if (!strcmp(prom_name, "SUNW,qfe") || !strcmp(prom_name, "qfe")) {
 		qp = quattro_pci_find(pdev);
 		if (qp == NULL)