Skip to content

Commit 3414cda

Browse files
antheastiwai
authored andcommitted
ALSA: hda/realtek: Remove (revert) duplicate Ally X config
In commit 1e9c708 ("ALSA: hda/tas2781: Add new quirk for Lenovo, ASUS, Dell projects") Baojun adds a bunch of projects to the file, including for the Ally X. Turns out the initial Ally X was not sorted properly, so the kernel had 2 quirks for it. The previous quirk overrode the new one due to being earlier and they are different. When AB testing, the normal pin fixup seems to work ok but causes a bit of a minor popping. Given the other config is more complicated and may cause undefined behavior, revert it. Fixes: 1e9c708 ("ALSA: hda/tas2781: Add new quirk for Lenovo, ASUS, Dell projects") Signed-off-by: Antheas Kapenekakis <lkml@antheas.dev> Link: https://patch.msgid.link/20250227175107.33432-2-lkml@antheas.dev Signed-off-by: Takashi Iwai <tiwai@suse.de>
1 parent fe1544d commit 3414cda

File tree

1 file changed

+0
-8
lines changed

1 file changed

+0
-8
lines changed

sound/pci/hda/patch_realtek.c

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7690,7 +7690,6 @@ enum {
76907690
ALC285_FIXUP_THINKPAD_X1_GEN7,
76917691
ALC285_FIXUP_THINKPAD_HEADSET_JACK,
76927692
ALC294_FIXUP_ASUS_ALLY,
7693-
ALC294_FIXUP_ASUS_ALLY_X,
76947693
ALC294_FIXUP_ASUS_ALLY_PINS,
76957694
ALC294_FIXUP_ASUS_ALLY_VERBS,
76967695
ALC294_FIXUP_ASUS_ALLY_SPEAKER,
@@ -9138,12 +9137,6 @@ static const struct hda_fixup alc269_fixups[] = {
91389137
.chained = true,
91399138
.chain_id = ALC294_FIXUP_ASUS_ALLY_PINS
91409139
},
9141-
[ALC294_FIXUP_ASUS_ALLY_X] = {
9142-
.type = HDA_FIXUP_FUNC,
9143-
.v.func = tas2781_fixup_i2c,
9144-
.chained = true,
9145-
.chain_id = ALC294_FIXUP_ASUS_ALLY_PINS
9146-
},
91479140
[ALC294_FIXUP_ASUS_ALLY_PINS] = {
91489141
.type = HDA_FIXUP_PINS,
91499142
.v.pins = (const struct hda_pintbl[]) {
@@ -10645,7 +10638,6 @@ static const struct hda_quirk alc269_fixup_tbl[] = {
1064510638
SND_PCI_QUIRK(0x1043, 0x1740, "ASUS UX430UA", ALC295_FIXUP_ASUS_DACS),
1064610639
SND_PCI_QUIRK(0x1043, 0x17d1, "ASUS UX431FL", ALC294_FIXUP_ASUS_DUAL_SPK),
1064710640
SND_PCI_QUIRK(0x1043, 0x17f3, "ROG Ally NR2301L/X", ALC294_FIXUP_ASUS_ALLY),
10648-
SND_PCI_QUIRK(0x1043, 0x1eb3, "ROG Ally X RC72LA", ALC294_FIXUP_ASUS_ALLY_X),
1064910641
SND_PCI_QUIRK(0x1043, 0x1863, "ASUS UX6404VI/VV", ALC245_FIXUP_CS35L41_SPI_2),
1065010642
SND_PCI_QUIRK(0x1043, 0x1881, "ASUS Zephyrus S/M", ALC294_FIXUP_ASUS_GX502_PINS),
1065110643
SND_PCI_QUIRK(0x1043, 0x18b1, "Asus MJ401TA", ALC256_FIXUP_ASUS_HEADSET_MIC),

0 commit comments

Comments
 (0)