Module Name: src
Committed By: jruoho
Date: Wed Jan 5 08:08:47 UTC 2011
Modified Files:
src/sys/dev/acpi: acpi.c
Log Message:
Adjust previous slightly.
To generate a diff of this commit:
cvs rdiff -u -r1.226 -r1.227 src/sys/dev/acpi/acpi.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/dev/acpi/acpi.c
diff -u src/sys/dev/acpi/acpi.c:1.226 src/sys/dev/acpi/acpi.c:1.227
--- src/sys/dev/acpi/acpi.c:1.226 Wed Jan 5 07:58:04 2011
+++ src/sys/dev/acpi/acpi.c Wed Jan 5 08:08:47 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: acpi.c,v 1.226 2011/01/05 07:58:04 jruoho Exp $ */
+/* $NetBSD: acpi.c,v 1.227 2011/01/05 08:08:47 jruoho Exp $ */
/*-
* Copyright (c) 2003, 2007 The NetBSD Foundation, Inc.
@@ -100,7 +100,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: acpi.c,v 1.226 2011/01/05 07:58:04 jruoho Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi.c,v 1.227 2011/01/05 08:08:47 jruoho Exp $");
#include "opt_acpi.h"
#include "opt_pcifixup.h"
@@ -1035,16 +1035,13 @@
continue;
}
- /*
- * Handled internally.
- */
if (di->Type == ACPI_TYPE_POWER)
continue;
- /*
- * Skip ignored HIDs.
- */
- if (acpi_match_hid(di, acpi_ignored_ids))
+ if (acpi_match_hid(di, acpi_early_ids) != 0)
+ continue;
+
+ if (acpi_match_hid(di, acpi_ignored_ids) != 0)
continue;
aa.aa_node = ad;
