Module Name: src
Committed By: jruoho
Date: Fri Aug 20 06:36:41 UTC 2010
Modified Files:
src/sys/dev/acpi: acpi_cpu_pstate.c
Log Message:
Give a hint about a driver conflict.
To generate a diff of this commit:
cvs rdiff -u -r1.31 -r1.32 src/sys/dev/acpi/acpi_cpu_pstate.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_cpu_pstate.c
diff -u src/sys/dev/acpi/acpi_cpu_pstate.c:1.31 src/sys/dev/acpi/acpi_cpu_pstate.c:1.32
--- src/sys/dev/acpi/acpi_cpu_pstate.c:1.31 Fri Aug 20 04:16:00 2010
+++ src/sys/dev/acpi/acpi_cpu_pstate.c Fri Aug 20 06:36:40 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: acpi_cpu_pstate.c,v 1.31 2010/08/20 04:16:00 jruoho Exp $ */
+/* $NetBSD: acpi_cpu_pstate.c,v 1.32 2010/08/20 06:36:40 jruoho Exp $ */
/*-
* Copyright (c) 2010 Jukka Ruohonen <jruoho...@iki.fi>
@@ -27,7 +27,7 @@
* SUCH DAMAGE.
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: acpi_cpu_pstate.c,v 1.31 2010/08/20 04:16:00 jruoho Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi_cpu_pstate.c,v 1.32 2010/08/20 06:36:40 jruoho Exp $");
#include <sys/param.h>
#include <sys/evcnt.h>
@@ -274,6 +274,12 @@
fail:
sc->sc_flags &= ~ACPICPU_FLAG_P;
+
+ if (rv == EEXIST) {
+ aprint_error_dev(self, "driver conflicts with existing one\n");
+ return;
+ }
+
aprint_error_dev(self, "failed to start P-states (err %d)\n", rv);
}
