Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1947520AbWLHX6p (ORCPT ); Fri, 8 Dec 2006 18:58:45 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1947523AbWLHX6L (ORCPT ); Fri, 8 Dec 2006 18:58:11 -0500 Received: from 216-99-217-87.dsl.aracnet.com ([216.99.217.87]:60351 "EHLO sous-sol.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1947517AbWLHX5l (ORCPT ); Fri, 8 Dec 2006 18:57:41 -0500 Message-Id: <20061209000014.955633000@sous-sol.org> References: <20061208235751.890503000@sous-sol.org> User-Agent: quilt/0.45-1 Date: Fri, 08 Dec 2006 15:58:02 -0800 From: Chris Wright To: linux-kernel@vger.kernel.org, stable@kernel.org Cc: Justin Forbes , Zwane Mwaikambo , "Theodore Ts'o" , Randy Dunlap , Dave Jones , Chuck Wolber , Chris Wedgwood , Michael Krufky , torvalds@osdl.org, akpm@osdl.org, alan@lxorguk.ukuu.org.uk, David Miller , Jurij Smakov Subject: [patch 11/32] SUNHME: Fix for sunhme failures on x86 Content-Disposition: inline; filename=sunhme-fix-for-sunhme-failures-on-x86.patch Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1291 Lines: 41 -stable review patch. If anyone has any objections, please let us know. ------------------ From: Jurij Smakov 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 Signed-off-by: David S. Miller Signed-off-by: Chris Wright --- 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) -- - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/