Merge branch 'fix/hda' into for-linus
* fix/hda: ALSA: hda - Fix pin-setup for Sony VAIO with STAC9872 codecs ALSA: hda - Add quirk for Gateway T6834c laptop ALSA: hda_codec: Check for invalid zero connections
This commit is contained in:
commit
a9d90c81b5
|
@ -332,6 +332,12 @@ int snd_hda_get_connections(struct hda_codec *codec, hda_nid_t nid,
|
|||
AC_VERB_GET_CONNECT_LIST, i);
|
||||
range_val = !!(parm & (1 << (shift-1))); /* ranges */
|
||||
val = parm & mask;
|
||||
if (val == 0) {
|
||||
snd_printk(KERN_WARNING "hda_codec: "
|
||||
"invalid CONNECT_LIST verb %x[%i]:%x\n",
|
||||
nid, i, parm);
|
||||
return 0;
|
||||
}
|
||||
parm >>= shift;
|
||||
if (range_val) {
|
||||
/* ranges between the previous and this one */
|
||||
|
|
|
@ -2378,6 +2378,7 @@ static struct snd_pci_quirk stac9205_cfg_tbl[] = {
|
|||
SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x0228,
|
||||
"Dell Vostro 1500", STAC_9205_DELL_M42),
|
||||
/* Gateway */
|
||||
SND_PCI_QUIRK(0x107b, 0x0560, "Gateway T6834c", STAC_9205_EAPD),
|
||||
SND_PCI_QUIRK(0x107b, 0x0565, "Gateway T1616", STAC_9205_EAPD),
|
||||
{} /* terminator */
|
||||
};
|
||||
|
@ -5854,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 */
|
||||
};
|
||||
|
||||
|
@ -5866,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,
|
||||
|
@ -5877,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