Merge branches 'acpi-pm', 'acpi-processor', 'acpi-ec' and 'acpi-video'

[linux-block.git] / drivers / acpi / ec.c

diff --git a/drivers/acpi/ec.c b/drivers/acpi/ec.c
index 9b42628cf21b328963285e2c04b1e92d912fbb1a..2520fb998ce60ae30e7092dbde9121a019212a1e 100644 (file)
--- a/drivers/acpi/ec.c
+++ b/drivers/acpi/ec.c
@@ -1663,12 +1663,12 @@ err:
        return ret;
 }
 
-static int acpi_ec_remove(struct acpi_device *device)
+static void acpi_ec_remove(struct acpi_device *device)
 {
        struct acpi_ec *ec;
 
        if (!device)
-               return -EINVAL;
+               return;
 
        ec = acpi_driver_data(device);
        release_region(ec->data_addr, 1);
@@ -1678,7 +1678,6 @@ static int acpi_ec_remove(struct acpi_device *device)
                ec_remove_handlers(ec);
                acpi_ec_free(ec);
        }
-       return 0;
 }
 
 static acpi_status
@@ -1875,6 +1874,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