diff options
author | Takashi Iwai <tiwai@suse.de> | 2009-07-21 19:03:20 +0200 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2009-07-21 19:03:20 +0200 |
commit | a9d90c81b536cc0567bdf22a8aaefe180a5b0f7a (patch) | |
tree | 6a6ae15a9dce858fa562223efc7c4f7d40f2bb10 /sound/pci/hda/hda_codec.c | |
parent | 36766835ed17f0a10039272693d3c17e8f8a5142 (diff) | |
parent | b04add956616b6d89ff21da749b46ad2bd58ef32 (diff) |
Merge branch 'fix/hda' into for-linus
* fix/hda:
ALSA: hda - Fix pin-setup for Sony VAIO with STAC9872 codecs
ALSA: hda - Add quirk for Gateway T6834c laptop
ALSA: hda_codec: Check for invalid zero connections
Diffstat (limited to 'sound/pci/hda/hda_codec.c')
-rw-r--r-- | sound/pci/hda/hda_codec.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/sound/pci/hda/hda_codec.c b/sound/pci/hda/hda_codec.c index 26d255de6be..88480c0c58a 100644 --- a/sound/pci/hda/hda_codec.c +++ b/sound/pci/hda/hda_codec.c @@ -332,6 +332,12 @@ int snd_hda_get_connections(struct hda_codec *codec, hda_nid_t nid, AC_VERB_GET_CONNECT_LIST, i); range_val = !!(parm & (1 << (shift-1))); /* ranges */ val = parm & mask; + if (val == 0) { + snd_printk(KERN_WARNING "hda_codec: " + "invalid CONNECT_LIST verb %x[%i]:%x\n", + nid, i, parm); + return 0; + } parm >>= shift; if (range_val) { /* ranges between the previous and this one */ |