Merge branch 'fix/hda' into for-linus

* fix/hda: ALSA: hda_intel: more strict alc880_parse_auto_config dig_nid checking
git-mirror · Jul 16, 2009 · 2688779 · 2688779
2 parents 9d5b28d + 9d30937
commit 2688779
Showing 1 changed file with 6 additions and 0 deletions.
diff --git 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 {