[alsa-devel] [PATCH] ALSA: hda - Fix double quirk for Quanta FL1

[Takashi Iwai]

At Wed,  8 Aug 2012 08:43:37 +0200,
David Henningsson wrote:
> 
> The same ID is twice in the quirk table, so the second one is not used.
> You probably meant to chain them, like this?
> 
> Signed-off-by: David Henningsson <david.henningsson at canonical.com>

Good catch, it was an overlooked merge to a fix up table from the
former individual quirks.  The bug is present since 3.2, I added Cc to
stable, too.


thanks,

Takashi

> ---
>  sound/pci/hda/patch_realtek.c |    5 +++--
>  1 file changed, 3 insertions(+), 2 deletions(-)
> 
> diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c
> index daa5103..4f81dd4 100644
> --- a/sound/pci/hda/patch_realtek.c
> +++ b/sound/pci/hda/patch_realtek.c
> @@ -6099,6 +6099,8 @@ static const struct alc_fixup alc269_fixups[] = {
>  	[ALC269_FIXUP_PCM_44K] = {
>  		.type = ALC_FIXUP_FUNC,
>  		.v.func = alc269_fixup_pcm_44k,
> +		.chained = true,
> +		.chain_id = ALC269_FIXUP_QUANTA_MUTE
>  	},
>  	[ALC269_FIXUP_STEREO_DMIC] = {
>  		.type = ALC_FIXUP_FUNC,
> @@ -6210,8 +6212,7 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = {
>  	SND_PCI_QUIRK(0x17aa, 0x21fa, "Thinkpad X230", ALC269_FIXUP_LENOVO_DOCK),
>  	SND_PCI_QUIRK(0x17aa, 0x21fb, "Thinkpad T430s", ALC269_FIXUP_LENOVO_DOCK),
>  	SND_PCI_QUIRK(0x17aa, 0x2203, "Thinkpad X230 Tablet", ALC269_FIXUP_LENOVO_DOCK),
> -	SND_PCI_QUIRK(0x17aa, 0x3bf8, "Quanta FL1", ALC269_FIXUP_QUANTA_MUTE),
> -	SND_PCI_QUIRK(0x17aa, 0x3bf8, "Lenovo Ideapd", ALC269_FIXUP_PCM_44K),
> +	SND_PCI_QUIRK(0x17aa, 0x3bf8, "Quanta FL1", ALC269_FIXUP_PCM_44K),
>  	SND_PCI_QUIRK(0x17aa, 0x9e54, "LENOVO NB", ALC269_FIXUP_LENOVO_EAPD),
>  
>  #if 0
> -- 
> 1.7.9.5
>