iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'fix/hda' into topic/hda

Browse Source
This commit is contained in:
Takashi Iwai 2009-07-19 13:52:31 +02:00
commit 05e870d29a
2 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sound/pci/hda/hda_codec.c
View File

@ -347,6 +347,12 @@ int snd_hda_get_connections(struct hda_codec *codec, hda_nid_t nid,
} }
range_val = !!(parm & (1 << (shift-1))); /* ranges */ range_val = !!(parm & (1 << (shift-1))); /* ranges */
val = parm & mask; 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; parm >>= shift;
if (range_val) { if (range_val) {
/* ranges between the previous and this one */ /* ranges between the previous and this one */

6
sound/pci/hda/patch_realtek.c
View File

@ -4501,6 +4501,12 @@ static int alc880_parse_auto_config(struct hda_codec *codec)
&dig_nid, 1); &dig_nid, 1);
if (err < 0) if (err < 0)
continue; continue;
if (dig_nid > 0x7f) {
printk(KERN_ERR "alc880_auto: invalid dig_nid "
"connection 0x%x for NID 0x%x\n", dig_nid,
spec->autocfg.dig_out_pins[i]);
continue;
}
if (!i) if (!i)
spec->multiout.dig_out_nid = dig_nid; spec->multiout.dig_out_nid = dig_nid;
else { else {