UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'fix/hda' into for-linus 

* fix/hda:
  ALSA: hda_intel: more strict alc880_parse_auto_config dig_nid checking
This commit is contained in:
Takashi Iwai 2009-07-16 16:35:47 +02:00
parent 9d5b28d530 9d30937acc
commit 26887793b6
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -4505,6 +4505,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 {