From b5c0f241ebae2ac80196a43a8b8ca20d50f0ab3b Mon Sep 17 00:00:00 2001 From: Mark Kettenis Date: Thu, 30 Aug 2018 10:11:35 +0000 Subject: 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@ --- sys/dev/acpi/acpi.c | 10 +++++----- 1 file 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 * Copyright (c) 2005 Jordan Hargrave @@ -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); -- cgit v1.2.3