 @@ -1,14 +1,14 @@
-/*	$NetBSD: wmi_acpi.c,v 1.15 2017/06/01 02:45:09 chs Exp $	*/
+/*	$NetBSD: wmi_acpi.c,v 1.16 2017/12/03 17:34:50 bouyer Exp $	*/
 /*-
  * Copyright (c) 2009, 2010 Jukka Ruohonen <jruohonen@iki.fi>
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
+ *
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
 @@ -17,27 +17,27 @@
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: wmi_acpi.c,v 1.15 2017/06/01 02:45:09 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wmi_acpi.c,v 1.16 2017/12/03 17:34:50 bouyer Exp $");
 #include <sys/param.h>
 #include <sys/device.h>
 #include <sys/endian.h>
 #include <sys/kmem.h>
 #include <sys/systm.h>
 #include <sys/module.h>
 #include <dev/acpi/acpireg.h>
 #include <dev/acpi/acpivar.h>
 #include <dev/acpi/acpi_ecvar.h>
 #include <dev/acpi/wmi/wmi_acpivar.h>
 @@ -313,39 +313,40 @@ acpi_wmi_init_ec(struct acpi_wmi_softc *
 	    ACPI_ADR_SPACE_EC, acpi_wmi_ec_handler, NULL, sc);
 	if (ACPI_FAILURE(rv))
 		sc->sc_ecdev = NULL;
+}
 static ACPI_STATUS
 acpi_wmi_guid_get(struct acpi_wmi_softc *sc,
     const char *src, struct wmi_t **out)
+{
 	struct wmi_t *wmi;
 	struct guid_t *guid;
 	char bin[16];
-	char hex[2];
+	char hex[3];
 	const char *ptr;
 	uint8_t i;
 	if (sc == NULL || src == NULL || strlen(src) != 36)
 		return AE_BAD_PARAMETER;
 	for (ptr = src, i = 0; i < 16; i++) {
 		if (*ptr == '-')
 			ptr++;
 		(void)memcpy(hex, ptr, 2);
 		hex[2] = '\0';
 		if (HEXCHAR(hex[0]) == 0 || HEXCHAR(hex[1]) == 0)
 			return AE_BAD_HEX_CONSTANT;
 		bin[i] = strtoul(hex, NULL, 16) & 0xFF;
 		ptr++;
 		ptr++;
+	}
 	guid = (struct guid_t *)bin;
 	guid->data1 = be32toh(guid->data1);
 	guid->data2 = be16toh(guid->data2);
 @@ -603,28 +604,30 @@ static ACPI_STATUS
 acpi_wmi_enable_collection(ACPI_HANDLE hdl, const char *oid, bool flag)
+{
 	char path[5];
 	strlcpy(path, "WC", sizeof(path));
 	strlcat(path, oid, sizeof(path));
 	return acpi_eval_set_integer(hdl, path, (flag != false) ? 0x01 : 0x00);
+}
 static bool
 acpi_wmi_input(struct wmi_t *wmi, uint8_t flag, uint8_t idx)
+{
 	/* A data block may have no flags at all */
-	if ((wmi->guid.flags & flag) == 0)
+	if ((wmi->guid.flags & flag) == 0 &&
 	    (flag == ACPI_WMI_FLAG_DATA  &&
 	     (wmi->guid.flags & ~ACPI_WMI_FLAG_EXPENSIVE) != 0))
 		return false;
 	if (wmi->guid.count == 0x00)
 		return false;
 	if (wmi->guid.count < idx)
 		return false;
 	return true;
+}
 /*
  * Makes a WMI data block query (WQxx). The corresponding control