diff options
| author | Takashi Iwai <tiwai@suse.de> | 2009-07-16 16:35:47 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2009-07-16 16:35:47 +0200 |
| commit | 26887793b64ae93342c1e2548595d4c6f7dce694 (patch) | |
| tree | f6ab1830d5664c01009096297d328b70314d636e /sound/pci | |
| parent | 9d5b28d530000aa5a256046f0dd42a3787687cc9 (diff) | |
| parent | 9d30937accf2c01e8b0bd59787409a7348cbbcb7 (diff) | |
| download | kernel_samsung_aries-26887793b64ae93342c1e2548595d4c6f7dce694.zip kernel_samsung_aries-26887793b64ae93342c1e2548595d4c6f7dce694.tar.gz kernel_samsung_aries-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/pci')
| -rw-r--r-- | sound/pci/hda/patch_realtek.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c index bbb9b42..7e99763 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 { |