From 24ca85d180ba449391f5cfda4024c0aeb55e0385 Mon Sep 17 00:00:00 2001 From: jruoho Date: Fri, 20 Aug 2010 06:36:40 +0000 Subject: [PATCH] Give a hint about a driver conflict. --- sys/dev/acpi/acpi_cpu_pstate.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/sys/dev/acpi/acpi_cpu_pstate.c b/sys/dev/acpi/acpi_cpu_pstate.c index d2e4e30f5f62..0b313e3384b4 100644 --- a/sys/dev/acpi/acpi_cpu_pstate.c +++ b/sys/dev/acpi/acpi_cpu_pstate.c @@ -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 @@ -27,7 +27,7 @@ * SUCH DAMAGE. */ #include -__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 #include @@ -274,6 +274,12 @@ acpicpu_pstate_start(device_t self) 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); }