diff --git a/sys/dev/acpi/acpi_power.c b/sys/dev/acpi/acpi_power.c index 7f91bb9ca355..1abca6fe0855 100644 --- a/sys/dev/acpi/acpi_power.c +++ b/sys/dev/acpi/acpi_power.c @@ -1,4 +1,4 @@ -/* $NetBSD: acpi_power.c,v 1.8 2010/04/24 19:36:14 jruoho Exp $ */ +/* $NetBSD: acpi_power.c,v 1.9 2010/04/26 12:46:48 jruoho Exp $ */ /*- * Copyright (c) 2009, 2010 The NetBSD Foundation, Inc. @@ -56,7 +56,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: acpi_power.c,v 1.8 2010/04/24 19:36:14 jruoho Exp $"); +__KERNEL_RCSID(0, "$NetBSD: acpi_power.c,v 1.9 2010/04/26 12:46:48 jruoho Exp $"); #include #include @@ -342,7 +342,7 @@ acpi_power_get_indirect(struct acpi_devnode *ad) */ rv = acpi_foreach_package_object(pkg, acpi_power_res_sta, ad); - if (ACPI_FAILURE(rv) && rv != AE_CTRL_TERMINATE) + if (ACPI_FAILURE(rv) && rv != AE_CTRL_FALSE) goto out; if (ACPI_SUCCESS(rv)) { @@ -646,12 +646,12 @@ acpi_power_res_sta(ACPI_OBJECT *elm, void *arg) return AE_BAD_VALUE; if ((int)val != ACPI_STA_POW_ON) - return AE_CTRL_TERMINATE; /* XXX: Not an error. */ + return AE_CTRL_FALSE; /* XXX: Not an error. */ return AE_OK; fail: - if (rv == AE_CTRL_TERMINATE) + if (rv == AE_CTRL_CTRL_FALSE) rv = AE_ERROR; ACPI_DEBUG_PRINT((ACPI_DB_DEBUG_OBJECT, "failed to evaluate _STA "