Skip to content

Commit 9dc5d98

Browse files
committed
Merge tag 'acpi-5.7-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm
Pull ACPI fixes from Rafael Wysocki: "Drop a lid status quirk for Asus T200TA that is not necessary any more and clean up a resource management inconsistency in the PCI IRQ link configuration code. Both changes from Hans de Goede" * tag 'acpi-5.7-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm: ACPI: button: Drop no longer necessary Asus T200TA lid_init_state quirk ACPI/PCI: pci_link: use extended_irq union member when setting ext-irq shareable
2 parents bc0c4d1 + 0db0d14 commit 9dc5d98

File tree

2 files changed

+2
-14
lines changed

2 files changed

+2
-14
lines changed

drivers/acpi/button.c

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -87,18 +87,6 @@ static const struct dmi_system_id dmi_lid_quirks[] = {
8787
},
8888
.driver_data = (void *)(long)ACPI_BUTTON_LID_INIT_DISABLED,
8989
},
90-
{
91-
/*
92-
* Asus T200TA, _LID keeps reporting closed after every second
93-
* openening of the lid. Causing immediate re-suspend after
94-
* opening every other open. Using LID_INIT_OPEN fixes this.
95-
*/
96-
.matches = {
97-
DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."),
98-
DMI_MATCH(DMI_PRODUCT_NAME, "T200TA"),
99-
},
100-
.driver_data = (void *)(long)ACPI_BUTTON_LID_INIT_OPEN,
101-
},
10290
{
10391
/* GP-electronic T701, _LID method points to a floating GPIO */
10492
.matches = {

drivers/acpi/pci_link.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -322,10 +322,10 @@ static int acpi_pci_link_set(struct acpi_pci_link *link, int irq)
322322
resource->res.data.extended_irq.polarity =
323323
link->irq.polarity;
324324
if (link->irq.triggering == ACPI_EDGE_SENSITIVE)
325-
resource->res.data.irq.shareable =
325+
resource->res.data.extended_irq.shareable =
326326
ACPI_EXCLUSIVE;
327327
else
328-
resource->res.data.irq.shareable = ACPI_SHARED;
328+
resource->res.data.extended_irq.shareable = ACPI_SHARED;
329329
resource->res.data.extended_irq.interrupt_count = 1;
330330
resource->res.data.extended_irq.interrupts[0] = irq;
331331
/* ignore resource_source, it's optional */

0 commit comments

Comments
 (0)