Module Name: src
Committed By: jruoho
Date: Sun Jan 2 12:06:02 UTC 2011
Modified Files:
src/sys/dev/acpi: acpi_power.c acpi_wakedev.c
Log Message:
Adjust error messages for the previous commit.
To generate a diff of this commit:
cvs rdiff -u -r1.24 -r1.25 src/sys/dev/acpi/acpi_power.c
cvs rdiff -u -r1.19 -r1.20 src/sys/dev/acpi/acpi_wakedev.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_power.c
diff -u src/sys/dev/acpi/acpi_power.c:1.24 src/sys/dev/acpi/acpi_power.c:1.25
--- src/sys/dev/acpi/acpi_power.c:1.24 Sun Jan 2 06:05:47 2011
+++ src/sys/dev/acpi/acpi_power.c Sun Jan 2 12:06:02 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: acpi_power.c,v 1.24 2011/01/02 06:05:47 jruoho Exp $ */
+/* $NetBSD: acpi_power.c,v 1.25 2011/01/02 12:06:02 jruoho Exp $ */
/*-
* Copyright (c) 2009, 2010 The NetBSD Foundation, Inc.
@@ -56,7 +56,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: acpi_power.c,v 1.24 2011/01/02 06:05:47 jruoho Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi_power.c,v 1.25 2011/01/02 12:06:02 jruoho Exp $");
#include <sys/param.h>
#include <sys/kmem.h>
@@ -760,7 +760,7 @@
if (err != 0)
aprint_error_dev(ad->ad_root, "sysctl_createv"
- "(hw.acpi.power.%s) failed (err %d)\n", ad->ad_name, err);
+ "(hw.acpi.power.%s) failed (err %d)\n", str, err);
}
static int
Index: src/sys/dev/acpi/acpi_wakedev.c
diff -u src/sys/dev/acpi/acpi_wakedev.c:1.19 src/sys/dev/acpi/acpi_wakedev.c:1.20
--- src/sys/dev/acpi/acpi_wakedev.c:1.19 Sun Jan 2 06:05:47 2011
+++ src/sys/dev/acpi/acpi_wakedev.c Sun Jan 2 12:06:02 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: acpi_wakedev.c,v 1.19 2011/01/02 06:05:47 jruoho Exp $ */
+/* $NetBSD: acpi_wakedev.c,v 1.20 2011/01/02 12:06:02 jruoho Exp $ */
/*-
* Copyright (c) 2009, 2010 Jared D. McNeill <[email protected]>
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: acpi_wakedev.c,v 1.19 2011/01/02 06:05:47 jruoho Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi_wakedev.c,v 1.20 2011/01/02 12:06:02 jruoho Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -132,7 +132,7 @@
if (err != 0)
aprint_error_dev(ad->ad_root, "sysctl_createv"
- "(hw.acpi.wake.%s) failed (err %d)\n", ad->ad_name, err);
+ "(hw.acpi.wake.%s) failed (err %d)\n", str, err);
}
void
