diff options
| author | Mark Kettenis <kettenis@cvs.openbsd.org> | 2018-08-30 10:11:35 +0000 |
|---|---|---|
| committer | Mark Kettenis <kettenis@cvs.openbsd.org> | 2018-08-30 10:11:35 +0000 |
| commit | b5c0f241ebae2ac80196a43a8b8ca20d50f0ab3b (patch) | |
| tree | a47ffd0fac1608cfa6da1dcd093e40e3e3c2a8e0 | |
| parent | 37cb31431c691c7446c37f77323b967fd461b957 (diff) | |
Move softbutton check before the check that skips attaching certain acpi
devices. Fixes regression caused by matching on _CID in addition to
matching on _HID.
ok matthieu@, mlarkin@
| -rw-r--r-- | sys/dev/acpi/acpi.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sys/dev/acpi/acpi.c b/sys/dev/acpi/acpi.c index 7f44f8b0778..8cb5bb39d60 100644 --- a/sys/dev/acpi/acpi.c +++ b/sys/dev/acpi/acpi.c @@ -1,4 +1,4 @@ -/* $OpenBSD: acpi.c,v 1.358 2018/08/25 09:39:20 kettenis Exp $ */ +/* $OpenBSD: acpi.c,v 1.359 2018/08/30 10:11:34 kettenis Exp $ */ /* * Copyright (c) 2005 Thorsten Lockert <tholo@sigmasoft.com> * Copyright (c) 2005 Jordan Hargrave <jordan@openbsd.org> @@ -3065,10 +3065,6 @@ acpi_foundhid(struct aml_node *node, void *arg) aaa.aaa_dev = dev; aaa.aaa_cdev = cdev; - if (acpi_matchhids(&aaa, acpi_skip_hids, "none") || - acpi_matchhids(&aaa, acpi_isa_hids, "none")) - return (0); - #ifndef SMALL_KERNEL if (!strcmp(cdev, ACPI_DEV_MOUSE)) { for (i = 0; i < nitems(sbtn_pnp); i++) { @@ -3080,6 +3076,10 @@ acpi_foundhid(struct aml_node *node, void *arg) } #endif + if (acpi_matchhids(&aaa, acpi_skip_hids, "none") || + acpi_matchhids(&aaa, acpi_isa_hids, "none")) + return (0); + if (!node->parent->attached) { node->parent->attached = 1; config_found(self, &aaa, acpi_print); |