Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys/dev/acpi Give a hint about a driver conflict.
details: https://anonhg.NetBSD.org/src/rev/ec4296cdc2ef
branches: trunk
changeset: 757221:ec4296cdc2ef
user: jruoho <jruoho%NetBSD.org@localhost>
date: Fri Aug 20 06:36:40 2010 +0000
description:
Give a hint about a driver conflict.
diffstat:
sys/dev/acpi/acpi_cpu_pstate.c | 10 ++++++++--
1 files changed, 8 insertions(+), 2 deletions(-)
diffs (31 lines):
diff -r 8060d13e2c06 -r ec4296cdc2ef sys/dev/acpi/acpi_cpu_pstate.c
--- a/sys/dev/acpi/acpi_cpu_pstate.c Fri Aug 20 06:35:55 2010 +0000
+++ b/sys/dev/acpi/acpi_cpu_pstate.c Fri Aug 20 06:36:40 2010 +0000
@@ -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 <jruohonen%iki.fi@localhost>
@@ -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);
}
Home |
Main Index |
Thread Index |
Old Index