| From stable-bounces@linux.kernel.org Sun Dec 3 19:41:54 2006 |
| Date: Sun, 03 Dec 2006 19:36:32 -0800 (PST) |
| Message-Id: <20061203.193632.41634212.davem@davemloft.net> |
| To: stable@kernel.org |
| From: David Miller <davem@davemloft.net> |
| Subject: SUNHME: Fix for sunhme failures on x86 |
| |
| From: Jurij Smakov <jurij@wooyd.org> |
| |
| 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> |
| --- |
| drivers/net/sunhme.c | 5 +++++ |
| 1 file changed, 5 insertions(+) |
| |
| --- linux-2.6.19.orig/drivers/net/sunhme.c |
| +++ linux-2.6.19/drivers/net/sunhme.c |
| @@ -3012,6 +3012,11 @@ static int __devinit happy_meal_pci_prob |
| #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) |
