Commit 3414cda9 authored by Antheas Kapenekakis's avatar Antheas Kapenekakis Committed by Takashi Iwai
Browse files

ALSA: hda/realtek: Remove (revert) duplicate Ally X config 



In commit 1e9c708d ("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: 1e9c708d ("ALSA: hda/tas2781: Add new quirk for Lenovo, ASUS, Dell projects")
Signed-off-by: default avatarAntheas Kapenekakis <lkml@antheas.dev>
Link: https://patch.msgid.link/20250227175107.33432-2-lkml@antheas.dev


Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent fe1544de

sound/pci/hda/patch_realtek.c

+0 −8
Original line number Diff line number Diff line
@@ -7690,7 +7690,6 @@ enum { 
	ALC285_FIXUP_THINKPAD_X1_GEN7,

	ALC285_FIXUP_THINKPAD_HEADSET_JACK,

	ALC294_FIXUP_ASUS_ALLY,

	ALC294_FIXUP_ASUS_ALLY_X,

	ALC294_FIXUP_ASUS_ALLY_PINS,

	ALC294_FIXUP_ASUS_ALLY_VERBS,

	ALC294_FIXUP_ASUS_ALLY_SPEAKER,
@@ -9138,12 +9137,6 @@ static const struct hda_fixup alc269_fixups[] = { 
		.chained = true,

		.chain_id = ALC294_FIXUP_ASUS_ALLY_PINS

	},

	[ALC294_FIXUP_ASUS_ALLY_X] = {

		.type = HDA_FIXUP_FUNC,

		.v.func = tas2781_fixup_i2c,

		.chained = true,

		.chain_id = ALC294_FIXUP_ASUS_ALLY_PINS

	},

	[ALC294_FIXUP_ASUS_ALLY_PINS] = {

		.type = HDA_FIXUP_PINS,

		.v.pins = (const struct hda_pintbl[]) {
@@ -10645,7 +10638,6 @@ static const struct hda_quirk alc269_fixup_tbl[] = { 
	SND_PCI_QUIRK(0x1043, 0x1740, "ASUS UX430UA", ALC295_FIXUP_ASUS_DACS),

	SND_PCI_QUIRK(0x1043, 0x17d1, "ASUS UX431FL", ALC294_FIXUP_ASUS_DUAL_SPK),

	SND_PCI_QUIRK(0x1043, 0x17f3, "ROG Ally NR2301L/X", ALC294_FIXUP_ASUS_ALLY),

	SND_PCI_QUIRK(0x1043, 0x1eb3, "ROG Ally X RC72LA", ALC294_FIXUP_ASUS_ALLY_X),

	SND_PCI_QUIRK(0x1043, 0x1863, "ASUS UX6404VI/VV", ALC245_FIXUP_CS35L41_SPI_2),

	SND_PCI_QUIRK(0x1043, 0x1881, "ASUS Zephyrus S/M", ALC294_FIXUP_ASUS_GX502_PINS),

	SND_PCI_QUIRK(0x1043, 0x18b1, "Asus MJ401TA", ALC256_FIXUP_ASUS_HEADSET_MIC),