From owner-p4-projects Sun Nov 24 21:44:30 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9140F37B404; Sun, 24 Nov 2002 21:44:28 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 2A0F937B401 for ; Sun, 24 Nov 2002 21:44:28 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id CF9E943E88 for ; Sun, 24 Nov 2002 21:44:27 -0800 (PST) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id gAP5f0mV043454 for ; Sun, 24 Nov 2002 21:41:01 -0800 (PST) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id gAP5f0kl043451 for perforce@freebsd.org; Sun, 24 Nov 2002 21:41:00 -0800 (PST) Date: Sun, 24 Nov 2002 21:41:00 -0800 (PST) Message-Id: <200211250541.gAP5f0kl043451@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar Subject: PERFORCE change 21471 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=21471 Change 21471 by marcel@marcel_nfs on 2002/11/24 21:40:55 Attach the `else' to the inner `if': If we cannot parse the PCI bus number by evaluating _BBN, and the error is AE_NOT_FOUND, we assume bus 0. Previously we set the bus to 0 if we could get the bus number through _BBN. Affected files ... .. //depot/projects/ia64/sys/dev/acpica/acpi_pcib_acpi.c#4 edit Differences ... ==== //depot/projects/ia64/sys/dev/acpica/acpi_pcib_acpi.c#4 (text+ko) ==== @@ -164,12 +164,12 @@ device_printf(dev, "could not evaluate _BBN - %s\n", AcpiFormatException(status)); return_VALUE(ENXIO); + } else { + /* if it's not found, assume 0 */ + sc->ap_bus = 0; } - } else { - /* if it's not found, assume 0 */ - sc->ap_bus = 0; } - + /* * If the bus is zero and pcib0 already exists, read the bus number * via PCI config space. To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message