]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
[SUNHME]: Fix for sunhme failures on x86
authorJurij Smakov <jurij@wooyd.org>
Mon, 4 Dec 2006 03:33:02 +0000 (19:33 -0800)
committerDavid S. Miller <davem@davemloft.net>
Mon, 4 Dec 2006 03:33:02 +0000 (19:33 -0800)
The following patch fixes the failure of sunhme drivers on x86 hosts
due to missing pci_enable_device() and pci_set_master() calls, lost
during code refactoring. It has been filed as bugzilla bug #7502 [0]
and Debian bug #397460 [1].

[0] http://bugzilla.kernel.org/show_bug.cgi?id=7502
[1] http://bugs.debian.org/397460

Signed-off-by: Jurij Smakov <jurij@wooyd.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/sunhme.c

index ec432ea879fbaa8d178a5a0e7253309264e3b1ec..df40e34c7766a3b0611325661917e6a8094f1593 100644 (file)
@@ -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)