From 4bd312791c4f292ba565157255f2508bdf35901d Mon Sep 17 00:00:00 2001 From: Jurij Smakov Date: Sun, 3 Dec 2006 19:33:02 -0800 Subject: [PATCH] --- yaml --- r: 42063 b: refs/heads/master c: ef9467f8f0803881d6b20ad6f0f770fc39bcc2c2 h: refs/heads/master i: 42061: fba94b3c371983c2b84d34db100e46d21055f3b6 42059: 1085d3abefd8105e9d57f9636922da11b0e9aa2b 42055: 51c21dcfcf6f9e4b3b0707d42dce1565e33b4c67 42047: 51fb840c351ca35796562952df639ed16932d5b3 v: v3 --- [refs] | 2 +- trunk/drivers/net/sunhme.c | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 376c08524cad..3e72074ea1c5 100644 --- 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 index ec432ea879fb..df40e34c7766 100644 --- 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)