summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJurij Smakov <jurij@wooyd.org>2006-12-03 19:36:32 -0800
committerChris Wright <chrisw@sous-sol.org>2006-12-16 16:20:47 -0800
commitb501bcbbb21d2222fa4f0a11d89dffa9fa508be3 (patch)
tree1979315b9627be4c38009885e03165f492db3665
parent69ba0bfa9c9b97a0dfdfd1b631dec02883aa2b75 (diff)
[PATCH] 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> Signed-off-by: Chris Wright <chrisw@sous-sol.org>
-rw-r--r--drivers/net/sunhme.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/net/sunhme.c b/drivers/net/sunhme.c
index c6f5bc3c042f..3bbf0c80b079 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)