Revert "Bluetooth: hci_bcm: Treat Interrupt ACPI resources as always being active...

This reverts commit 9e483bc229f54ecfdd87f630d9b265c3223e3671.

diff --git a/drivers/bluetooth/hci_bcm.c b/drivers/bluetooth/hci_bcm.c
index 32527bdf4b50995445196b8074c96033c9123615..73d2d88ddc03987cf4275d51b2fb1a952a924d15 100644 (file)
--- a/drivers/bluetooth/hci_bcm.c
+++ b/drivers/bluetooth/hci_bcm.c
@@ -694,6 +694,22 @@ static const struct acpi_gpio_mapping acpi_bcm_int_first_gpios[] = {
 #ifdef CONFIG_ACPI
 /* IRQ polarity of some chipsets are not defined correctly in ACPI table. */
 static const struct dmi_system_id bcm_active_low_irq_dmi_table[] = {
+       {
+               .ident = "Asus T100TA",
+               .matches = {
+                       DMI_EXACT_MATCH(DMI_SYS_VENDOR,
+                                       "ASUSTeK COMPUTER INC."),
+                       DMI_EXACT_MATCH(DMI_PRODUCT_NAME, "T100TA"),
+               },
+       },
+       {
+               .ident = "Asus T100CHI",
+               .matches = {
+                       DMI_EXACT_MATCH(DMI_SYS_VENDOR,
+                                       "ASUSTeK COMPUTER INC."),
+                       DMI_EXACT_MATCH(DMI_PRODUCT_NAME, "T100CHI"),
+               },
+       },
        {       /* Handle ThinkPad 8 tablets with BCM2E55 chipset ACPI ID */
                .ident = "Lenovo ThinkPad 8",
                .matches = {
@@ -714,9 +730,7 @@ static int bcm_resource(struct acpi_resource *ares, void *data)
        switch (ares->type) {
        case ACPI_RESOURCE_TYPE_EXTENDED_IRQ:
                irq = &ares->data.extended_irq;
-               if (irq->polarity != ACPI_ACTIVE_LOW)
-                       dev_info(&dev->pdev->dev, "ACPI Interrupt resource is active-high, this is usually wrong, treating the IRQ as active-low\n");
-               dev->irq_active_low = true;
+               dev->irq_active_low = irq->polarity == ACPI_ACTIVE_LOW;
                break;
 
        case ACPI_RESOURCE_TYPE_GPIO: