[src/trunk]: src/sys/dev/acpi * Fix the type of the input buffer in the WMI m...

[jruoho <jruoho%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/ed0ac27a1270
branches:  trunk
changeset: 751058:ed0ac27a1270
user:      jruoho <jruoho%NetBSD.org@localhost>
date:      Sat Jan 23 12:48:19 2010 +0000

description:
* Fix the type of the input buffer in the WMI method call.
* Do not error out if the flags field is is 0x00. Observed by cegger@.

diffstat:

 sys/dev/acpi/wmi_acpi.c |  8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diffs (36 lines):

diff -r 7b3d6a0869f3 -r ed0ac27a1270 sys/dev/acpi/wmi_acpi.c
--- a/sys/dev/acpi/wmi_acpi.c   Sat Jan 23 10:47:04 2010 +0000
+++ b/sys/dev/acpi/wmi_acpi.c   Sat Jan 23 12:48:19 2010 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: wmi_acpi.c,v 1.9 2010/01/09 15:34:59 jruoho Exp $      */
+/*     $NetBSD: wmi_acpi.c,v 1.10 2010/01/23 12:48:19 jruoho Exp $     */
 
 /*-
  * Copyright (c) 2009, 2010 Jukka Ruohonen <jruohonen%iki.fi@localhost>
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: wmi_acpi.c,v 1.9 2010/01/09 15:34:59 jruoho Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wmi_acpi.c,v 1.10 2010/01/23 12:48:19 jruoho Exp $");
 
 #include <sys/param.h>
 #include <sys/device.h>
@@ -581,7 +581,7 @@
        if (!(wmi->guid.flags & flag))
                return false;
 
-       if (wmi->guid.count == 0x00 || wmi->guid.flags == 0x00)
+       if (wmi->guid.count == 0x00)
                return false;
 
        if (wmi->guid.count < idx)
@@ -740,7 +740,7 @@
        obj[2].Buffer.Pointer = ibuf->Pointer;
 
        obj[2].Type = (wmi->guid.flags & ACPI_WMI_FLAG_STRING) ?
-           ACPI_TYPE_STRING : ACPI_TYPE_INTEGER;
+           ACPI_TYPE_STRING : ACPI_TYPE_BUFFER;
 
        arg.Count = 0x03;
        arg.Pointer = obj;