diff options
| author | Patrick Wildt <patrick@cvs.openbsd.org> | 2022-01-04 13:40:59 +0000 |
|---|---|---|
| committer | Patrick Wildt <patrick@cvs.openbsd.org> | 2022-01-04 13:40:59 +0000 |
| commit | 8fcfaa50c21af298eef26f1a4644f60351238bb9 (patch) | |
| tree | c9d2c1fed3861c44713b29a85595c78917b6869f | |
| parent | 603cf0a513e8d0c71ad38a2e8f8ea0bcd0f447ff (diff) | |
acpi_getprop() needs to actually make sure that we're looking at the
correct property. While there adjust acpi_getpropint() as well to
increase similarity with acpi_getprop().
ok kettenis@
| -rw-r--r-- | sys/dev/acpi/acpi.c | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/sys/dev/acpi/acpi.c b/sys/dev/acpi/acpi.c index 0e84622a6f4..3f5d8ea75fa 100644 --- a/sys/dev/acpi/acpi.c +++ b/sys/dev/acpi/acpi.c @@ -1,4 +1,4 @@ -/* $OpenBSD: acpi.c,v 1.403 2021/12/16 08:03:17 anton Exp $ */ +/* $OpenBSD: acpi.c,v 1.404 2022/01/04 13:40:58 patrick Exp $ */ /* * Copyright (c) 2005 Thorsten Lockert <tholo@sigmasoft.com> * Copyright (c) 2005 Jordan Hargrave <jordan@openbsd.org> @@ -2993,7 +2993,8 @@ acpi_getprop(struct aml_node *node, const char *prop, void *buf, int buflen) int len; if (res->type != AML_OBJTYPE_PACKAGE || res->length != 2 || - res->v_package[0]->type != AML_OBJTYPE_STRING) + res->v_package[0]->type != AML_OBJTYPE_STRING || + strcmp(res->v_package[0]->v_string, prop) != 0) continue; val = res->v_package[1]; @@ -3046,18 +3047,15 @@ acpi_getpropint(struct aml_node *node, const char *prop, uint32_t defval) struct aml_value *val; if (res->type != AML_OBJTYPE_PACKAGE || res->length != 2 || - res->v_package[0]->type != AML_OBJTYPE_STRING) + res->v_package[0]->type != AML_OBJTYPE_STRING || + strcmp(res->v_package[0]->v_string, prop) != 0) continue; val = res->v_package[1]; if (val->type == AML_OBJTYPE_OBJREF) val = val->v_objref.ref; - if (val->type != AML_OBJTYPE_INTEGER) - continue; - - if (strcmp(res->v_package[0]->v_string, prop) == 0 && - val->type == AML_OBJTYPE_INTEGER) + if (val->type == AML_OBJTYPE_INTEGER) return val->v_integer; } |