From: Takashi Iwai <tiwai@suse.de>
Date: Thu, 16 Jul 2009 14:35:47 +0000 (+0200)
Subject: Merge branch 'fix/hda' into for-linus
X-Git-Tag: v2.6.31-rc4~32^2~2
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=26887793b64ae93342c1e2548595d4c6f7dce694;hp=9d5b28d530000aa5a256046f0dd42a3787687cc9;p=pandora-kernel.git

Merge branch 'fix/hda' into for-linus

* fix/hda:
  ALSA: hda_intel: more strict alc880_parse_auto_config dig_nid checking
---

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 {