summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTheo de Raadt <deraadt@cvs.openbsd.org>2011-05-29 05:02:17 +0000
committerTheo de Raadt <deraadt@cvs.openbsd.org>2011-05-29 05:02:17 +0000
commit7676a6b5544706690939175a828e77680146901a (patch)
tree96382cc6f8ef6a0884f99c4c3b26bf8a06f8c007
parent31959992b146591e44cd88e699995da0b04c995d (diff)
Ignore errors from the UCMS method. Some newer (really crappy, stay
away from them) thinkpads are returning garbage for the return value. We never did anything special about the return value except spit out some noise, so silence it. ok mlarkin
-rw-r--r--sys/dev/acpi/acpithinkpad.c9
1 files changed, 2 insertions, 7 deletions
diff --git a/sys/dev/acpi/acpithinkpad.c b/sys/dev/acpi/acpithinkpad.c
index 73525695bf8..4e0a810f2c9 100644
--- a/sys/dev/acpi/acpithinkpad.c
+++ b/sys/dev/acpi/acpithinkpad.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: acpithinkpad.c,v 1.26 2011/04/27 20:55:42 jcs Exp $ */
+/* $OpenBSD: acpithinkpad.c,v 1.27 2011/05/29 05:02:16 deraadt Exp $ */
/*
* Copyright (c) 2008 joshua stein <jcs@openbsd.org>
*
@@ -401,12 +401,7 @@ thinkpad_cmos(struct acpithinkpad_softc *sc, uint8_t cmd)
bzero(&arg, sizeof(arg));
arg.type = AML_OBJTYPE_INTEGER;
arg.v_integer = cmd;
- if (aml_evalname(sc->sc_acpi, sc->sc_devnode, "\\UCMS",
- 1, &arg, NULL)) {
- printf("%s: cmos command 0x%x failed\n", DEVNAME(sc), cmd);
- return (1);
- }
-
+ aml_evalname(sc->sc_acpi, sc->sc_devnode, "\\UCMS", 1, &arg, NULL);
return (0);
}