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)