diff options
| author | Takashi Iwai <tiwai@suse.de> | 2009-07-19 13:52:31 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2009-07-19 13:52:31 +0200 |
| commit | 05e870d29aef0bf43124b2bd424103987fadd5b5 (patch) | |
| tree | c16af622c5da784653a418cede6fa7b4b3357270 /sound/pci/hda/hda_codec.c | |
| parent | ALSA: hda - Fix ALC268 parser for mono speaker (diff) | |
| parent | ALSA: hda_codec: Check for invalid zero connections (diff) | |
| download | linux-05e870d29aef0bf43124b2bd424103987fadd5b5.tar.xz linux-05e870d29aef0bf43124b2bd424103987fadd5b5.zip | |
Merge branch 'fix/hda' into topic/hda
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 35f0f223f85e..d686f4fcd780 100644 --- a/sound/pci/hda/hda_codec.c +++ b/sound/pci/hda/hda_codec.c @@ -347,6 +347,12 @@ int snd_hda_get_connections(struct hda_codec *codec, hda_nid_t nid, } 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 */ |