]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
ACPICA: Update the format of Arg3 of _DSM
authorSaket Dumbre <saket.dumbre@intel.com>
Tue, 17 Mar 2026 19:34:49 +0000 (20:34 +0100)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Tue, 17 Mar 2026 19:51:13 +0000 (20:51 +0100)
To get rid of type incompatibility warnings in Linux.

Fixes: 81f92cff6d42 ("ACPICA: ACPI_TYPE_ANY does not include the package type")
Link: https://github.com/acpica/acpica/commit/4fb74872dcec
Signed-off-by: Saket Dumbre <saket.dumbre@intel.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Link: https://patch.msgid.link/12856643.O9o76ZdvQC@rafael.j.wysocki
drivers/acpi/acpica/acpredef.h

index 6c9b5bf7d392dbdced086cd69951dd609384bc16..07d5790d09f8c4824c160ac1a2e328eced37fdf0 100644 (file)
@@ -451,7 +451,7 @@ const union acpi_predefined_info acpi_gbl_predefined_methods[] = {
 
        {{"_DSM",
          METHOD_4ARGS(ACPI_TYPE_BUFFER, ACPI_TYPE_INTEGER, ACPI_TYPE_INTEGER,
-                      ACPI_TYPE_ANY | ACPI_TYPE_PACKAGE) |
+                      ACPI_TYPE_PACKAGE | ACPI_TYPE_ANY) |
                       ARG_COUNT_IS_MINIMUM,
          METHOD_RETURNS(ACPI_RTYPE_ALL)}},     /* Must return a value, but it can be of any type */