diff options
| author | Subhransu S. Prusty <subhransu.s.prusty@intel.com> | 2016-03-14 10:35:06 +0530 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2016-03-14 08:30:47 +0100 |
| commit | 028cb68ee3d01f5323493cb3c07ba92b0acb2f03 (patch) | |
| tree | 29a147a56dd99e3b80f9154582675082b587780c /sound/pci | |
| parent | 4061db03dd71d195b9973ee466f6ed32f6a3fc16 (diff) | |
| download | op-kernel-dev-028cb68ee3d01f5323493cb3c07ba92b0acb2f03.zip op-kernel-dev-028cb68ee3d01f5323493cb3c07ba92b0acb2f03.tar.gz | |
ALSA: hda - Fixes double fault in nvhdmi_chmap_cea_alloc_validate_get_type
nvhdmi_chmap_cea_alloc_validate_get_type calls itself recursively
using chmap ops causing the double fault.
Fixed by adding the default validate_get_type handling inside nvdia
validate_get_type handler.
Link: https://bugzilla.kernel.org/show_bug.cgi?id=114311
Fixes: 67b90cb ("ALSA: hda - Create common chmap object")
Reported-by: Andreas Reis <andreas.reis@gmail.com>
Signed-off-by: Subhransu S. Prusty <subhransu.s.prusty@intel.com>
Tested-by: Andreas Reis <andreas.reis@gmail.com>
Signed-off-by: Vinod Koul <vinod.koul@intel.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/pci')
| -rw-r--r-- | sound/pci/hda/patch_hdmi.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/sound/pci/hda/patch_hdmi.c b/sound/pci/hda/patch_hdmi.c index 5fc9ff3..3fc2591 100644 --- a/sound/pci/hda/patch_hdmi.c +++ b/sound/pci/hda/patch_hdmi.c @@ -2836,8 +2836,12 @@ static int nvhdmi_chmap_cea_alloc_validate_get_type(struct hdac_chmap *chmap, if (cap->ca_index == 0x00 && channels == 2) return SNDRV_CTL_TLVT_CHMAP_FIXED; - return chmap->ops.chmap_cea_alloc_validate_get_type( - chmap, cap, channels); + /* If the speaker allocation matches the channel count, it is OK. */ + if (cap->channels != channels) + return -1; + + /* all channels are remappable freely */ + return SNDRV_CTL_TLVT_CHMAP_VAR; } static int nvhdmi_chmap_validate(struct hdac_chmap *chmap, |
