Merge back ACPI EC changes for 6.2-rc1

0634033d · Rafael J. Wysocki · 54c516ae · b423f240 · 0634033d
Commit 0634033d authored Dec 08, 2022 by Rafael J. Wysocki
Show whitespace changes
Inline Side-by-side

Showing with 10 additions and 0 deletions

drivers/acpi/ec.c drivers/acpi/ec.c +10 -0

No files found.
--- a/drivers/acpi/ec.c
+++ b/drivers/acpi/ec.c
@@ -1875,6 +1875,16 @@ static const struct dmi_system_id ec_dmi_table[] __initconst = {
 			DMI_MATCH(DMI_PRODUCT_NAME, "HP Pavilion Gaming Laptop 15-cx0xxx"),
 		},
 	},
+	{
+		/*
+		 * HP Pavilion Gaming Laptop 15-cx0041ur
+		 */
+		.callback = ec_honor_dsdt_gpe,
+		.matches = {
+			DMI_MATCH(DMI_SYS_VENDOR, "HP"),
+			DMI_MATCH(DMI_PRODUCT_NAME, "HP 15-cx0041ur"),
+		},
+	},
 	{
 		/*
 		 * Samsung hardware