Module Name: src
Committed By: martin
Date: Sat Sep 28 12:39:23 UTC 2019
Modified Files:
src/sys/dev/acpi [netbsd-9]: acpi_i2c.c
Log Message:
Pull up following revision(s) (requested by bouyer in ticket #265):
sys/dev/acpi/acpi_i2c.c: revision 1.5
joshua stein, PR kern/54493: acpi_i2c uses incorrect arguments for _DSM call
The last argument to the _DSM call has to be ACPI_TYPE_PACKAGE, as defined in in
clude/acpredef.h for _DSM.
Avoids an ACPI warning at boot.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.4.8.1 src/sys/dev/acpi/acpi_i2c.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/acpi/acpi_i2c.c
diff -u src/sys/dev/acpi/acpi_i2c.c:1.4 src/sys/dev/acpi/acpi_i2c.c:1.4.8.1
--- src/sys/dev/acpi/acpi_i2c.c:1.4 Sat May 5 17:16:23 2018
+++ src/sys/dev/acpi/acpi_i2c.c Sat Sep 28 12:39:23 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: acpi_i2c.c,v 1.4 2018/05/05 17:16:23 christos Exp $ */
+/* $NetBSD: acpi_i2c.c,v 1.4.8.1 2019/09/28 12:39:23 martin Exp $ */
/*-
* Copyright (c) 2017 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: acpi_i2c.c,v 1.4 2018/05/05 17:16:23 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi_i2c.c,v 1.4.8.1 2019/09/28 12:39:23 martin Exp $");
#include <dev/acpi/acpireg.h>
#include <dev/acpi/acpivar.h>
@@ -68,7 +68,7 @@ acpi_enter_i2c_hid(struct acpi_devnode *
obj[2].Type = ACPI_TYPE_INTEGER;
obj[2].Integer.Value = 1;
- obj[3].Type = ACPI_TYPE_ANY;
+ obj[3].Type = ACPI_TYPE_PACKAGE;
obj[3].Buffer.Length = 0;
buf.Pointer = NULL;
