ALSA: hda - Fix pin-setup for Sony VAIO with STAC9872 codecs
The recent rewrite of the codec parser for STAC9872 caused a regression for some Sony VAIO models that don't give proper pin default configs by BIOS. Even using model=vaio doesn't work because the pin definitions are set after the pin overrides. This patch fixes the pin definitions in patch_stac9872() to be put in the right place before the pin overrides. Also the patch adds the new quirk entry for VAIO F/S to have the correct pin default configs. Signed-off-by: Takashi Iwai <tiwai@suse.de> Cc: <stable@kernel.org>
This commit is contained in:
parent
42b95f0c6b
commit
b04add9566
|
@ -5855,6 +5855,8 @@ static unsigned int *stac9872_brd_tbl[STAC_9872_MODELS] = {
|
|||
};
|
||||
|
||||
static struct snd_pci_quirk stac9872_cfg_tbl[] = {
|
||||
SND_PCI_QUIRK_MASK(0x104d, 0xfff0, 0x81e0,
|
||||
"Sony VAIO F/S", STAC_9872_VAIO),
|
||||
{} /* terminator */
|
||||
};
|
||||
|
||||
|
@ -5867,6 +5869,8 @@ static int patch_stac9872(struct hda_codec *codec)
|
|||
if (spec == NULL)
|
||||
return -ENOMEM;
|
||||
codec->spec = spec;
|
||||
spec->num_pins = ARRAY_SIZE(stac9872_pin_nids);
|
||||
spec->pin_nids = stac9872_pin_nids;
|
||||
|
||||
spec->board_config = snd_hda_check_board_config(codec, STAC_9872_MODELS,
|
||||
stac9872_models,
|
||||
|
@ -5878,8 +5882,6 @@ static int patch_stac9872(struct hda_codec *codec)
|
|||
stac92xx_set_config_regs(codec,
|
||||
stac9872_brd_tbl[spec->board_config]);
|
||||
|
||||
spec->num_pins = ARRAY_SIZE(stac9872_pin_nids);
|
||||
spec->pin_nids = stac9872_pin_nids;
|
||||
spec->multiout.dac_nids = spec->dac_nids;
|
||||
spec->num_adcs = ARRAY_SIZE(stac9872_adc_nids);
|
||||
spec->adc_nids = stac9872_adc_nids;
|
||||
|
|
Loading…
Reference in a new issue