diff options
| author | Jurij Smakov <jurij@wooyd.org> | 2006-12-04 04:33:02 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2006-12-04 04:33:02 +0100 |
| commit | ef9467f8f0803881d6b20ad6f0f770fc39bcc2c2 (patch) | |
| tree | 9b28ff138e9a737ddd40df2ab77ae5df06d48712 /drivers | |
| parent | Merge master.kernel.org:/pub/scm/linux/kernel/git/acme/net-2.6 (diff) | |
| download | linux-ef9467f8f0803881d6b20ad6f0f770fc39bcc2c2.tar.xz linux-ef9467f8f0803881d6b20ad6f0f770fc39bcc2c2.zip | |
[SUNHME]: Fix for sunhme failures on x86
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>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/net/sunhme.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/net/sunhme.c b/drivers/net/sunhme.c index ec432ea879fb..df40e34c7766 100644 --- a/drivers/net/sunhme.c +++ b/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) |