Module Name: src
Committed By: jruoho
Date: Tue Jan 5 17:23:18 UTC 2010
Modified Files:
src/sys/arch/x86/x86: mpacpi.c
Log Message:
Put back the evaluation of the return value from mpacpi_get_bbn().
Break reported by nj...@. Thanks!
To generate a diff of this commit:
cvs rdiff -u -r1.82 -r1.83 src/sys/arch/x86/x86/mpacpi.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/x86/x86/mpacpi.c
diff -u src/sys/arch/x86/x86/mpacpi.c:1.82 src/sys/arch/x86/x86/mpacpi.c:1.83
--- src/sys/arch/x86/x86/mpacpi.c:1.82 Tue Jan 5 13:57:18 2010
+++ src/sys/arch/x86/x86/mpacpi.c Tue Jan 5 17:23:18 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: mpacpi.c,v 1.82 2010/01/05 13:57:18 jruoho Exp $ */
+/* $NetBSD: mpacpi.c,v 1.83 2010/01/05 17:23:18 jruoho Exp $ */
/*
* Copyright (c) 2003 Wasabi Systems, Inc.
@@ -36,7 +36,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mpacpi.c,v 1.82 2010/01/05 13:57:18 jruoho Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mpacpi.c,v 1.83 2010/01/05 17:23:18 jruoho Exp $");
#include "acpica.h"
#include "opt_acpi.h"
@@ -576,7 +576,9 @@
goto out;
if (acpi_match_hid(devinfo, pciroot_hid)) {
- (void)mpacpi_get_bbn(acpi, parent, &bus);
+ rv = mpacpi_get_bbn(acpi, parent, &bus);
+ if (ACPI_FAILURE(rv))
+ bus = 0;
ACPI_FREE(devinfo);
break;
}
