aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--sound/pci/hda/hda_codec.c6
-rw-r--r--sound/pci/hda/patch_sigmatel.c7
2 files changed, 11 insertions, 2 deletions
diff --git a/sound/pci/hda/hda_codec.c b/sound/pci/hda/hda_codec.c
index 26d255de6beb..88480c0c58a0 100644
--- a/sound/pci/hda/hda_codec.c
+++ b/sound/pci/hda/hda_codec.c
@@ -332,6 +332,12 @@ int snd_hda_get_connections(struct hda_codec *codec, hda_nid_t nid,
332 AC_VERB_GET_CONNECT_LIST, i); 332 AC_VERB_GET_CONNECT_LIST, i);
333 range_val = !!(parm & (1 << (shift-1))); /* ranges */ 333 range_val = !!(parm & (1 << (shift-1))); /* ranges */
334 val = parm & mask; 334 val = parm & mask;
335 if (val == 0) {
336 snd_printk(KERN_WARNING "hda_codec: "
337 "invalid CONNECT_LIST verb %x[%i]:%x\n",
338 nid, i, parm);
339 return 0;
340 }
335 parm >>= shift; 341 parm >>= shift;
336 if (range_val) { 342 if (range_val) {
337 /* ranges between the previous and this one */ 343 /* ranges between the previous and this one */
diff --git a/sound/pci/hda/patch_sigmatel.c b/sound/pci/hda/patch_sigmatel.c
index 41b5b3a18c1e..da7f9f65c047 100644
--- a/sound/pci/hda/patch_sigmatel.c
+++ b/sound/pci/hda/patch_sigmatel.c
@@ -2378,6 +2378,7 @@ static struct snd_pci_quirk stac9205_cfg_tbl[] = {
2378 SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x0228, 2378 SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x0228,
2379 "Dell Vostro 1500", STAC_9205_DELL_M42), 2379 "Dell Vostro 1500", STAC_9205_DELL_M42),
2380 /* Gateway */ 2380 /* Gateway */
2381 SND_PCI_QUIRK(0x107b, 0x0560, "Gateway T6834c", STAC_9205_EAPD),
2381 SND_PCI_QUIRK(0x107b, 0x0565, "Gateway T1616", STAC_9205_EAPD), 2382 SND_PCI_QUIRK(0x107b, 0x0565, "Gateway T1616", STAC_9205_EAPD),
2382 {} /* terminator */ 2383 {} /* terminator */
2383}; 2384};
@@ -5854,6 +5855,8 @@ static unsigned int *stac9872_brd_tbl[STAC_9872_MODELS] = {
5854}; 5855};
5855 5856
5856static struct snd_pci_quirk stac9872_cfg_tbl[] = { 5857static struct snd_pci_quirk stac9872_cfg_tbl[] = {
5858 SND_PCI_QUIRK_MASK(0x104d, 0xfff0, 0x81e0,
5859 "Sony VAIO F/S", STAC_9872_VAIO),
5857 {} /* terminator */ 5860 {} /* terminator */
5858}; 5861};
5859 5862
@@ -5866,6 +5869,8 @@ static int patch_stac9872(struct hda_codec *codec)
5866 if (spec == NULL) 5869 if (spec == NULL)
5867 return -ENOMEM; 5870 return -ENOMEM;
5868 codec->spec = spec; 5871 codec->spec = spec;
5872 spec->num_pins = ARRAY_SIZE(stac9872_pin_nids);
5873 spec->pin_nids = stac9872_pin_nids;
5869 5874
5870 spec->board_config = snd_hda_check_board_config(codec, STAC_9872_MODELS, 5875 spec->board_config = snd_hda_check_board_config(codec, STAC_9872_MODELS,
5871 stac9872_models, 5876 stac9872_models,
@@ -5877,8 +5882,6 @@ static int patch_stac9872(struct hda_codec *codec)
5877 stac92xx_set_config_regs(codec, 5882 stac92xx_set_config_regs(codec,
5878 stac9872_brd_tbl[spec->board_config]); 5883 stac9872_brd_tbl[spec->board_config]);
5879 5884
5880 spec->num_pins = ARRAY_SIZE(stac9872_pin_nids);
5881 spec->pin_nids = stac9872_pin_nids;
5882 spec->multiout.dac_nids = spec->dac_nids; 5885 spec->multiout.dac_nids = spec->dac_nids;
5883 spec->num_adcs = ARRAY_SIZE(stac9872_adc_nids); 5886 spec->num_adcs = ARRAY_SIZE(stac9872_adc_nids);
5884 spec->adc_nids = stac9872_adc_nids; 5887 spec->adc_nids = stac9872_adc_nids;