summaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2009-07-16 16:35:47 +0200
committerTakashi Iwai <tiwai@suse.de>2009-07-16 16:35:47 +0200
commit26887793b64ae93342c1e2548595d4c6f7dce694 (patch)
treef6ab1830d5664c01009096297d328b70314d636e /sound
parent9d5b28d530000aa5a256046f0dd42a3787687cc9 (diff)
parent9d30937accf2c01e8b0bd59787409a7348cbbcb7 (diff)
downloadlinux-26887793b64ae93342c1e2548595d4c6f7dce694.tar.bz2
Merge branch 'fix/hda' into for-linus
* fix/hda: ALSA: hda_intel: more strict alc880_parse_auto_config dig_nid checking
Diffstat (limited to 'sound')
-rw-r--r--sound/pci/hda/patch_realtek.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c
index bbb9b42e2604..7e99763ca527 100644
--- a/sound/pci/hda/patch_realtek.c
+++ b/sound/pci/hda/patch_realtek.c
@@ -4505,6 +4505,12 @@ static int alc880_parse_auto_config(struct hda_codec *codec)
&dig_nid, 1);
if (err < 0)
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)
spec->multiout.dig_out_nid = dig_nid;
else {