Commit 26887793 authored by Takashi Iwai's avatar Takashi Iwai
Browse files

Merge branch 'fix/hda' into for-linus 

* fix/hda:
  ALSA: hda_intel: more strict alc880_parse_auto_config dig_nid checking
parents 9d5b28d5 9d30937a

sound/pci/hda/patch_realtek.c

+6 −0
Original line number Diff line number Diff line
@@ -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 {