From: Subhransu S. Prusty Date: Mon, 14 Mar 2016 05:05:06 +0000 (+0530) Subject: ALSA: hda - Fixes double fault in nvhdmi_chmap_cea_alloc_validate_get_type X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=028cb68ee3d01f5323493cb3c07ba92b0acb2f03;p=deliverable%2Flinux.git 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 Signed-off-by: Subhransu S. Prusty Tested-by: Andreas Reis Signed-off-by: Vinod Koul Signed-off-by: Takashi Iwai --- diff --git a/sound/pci/hda/patch_hdmi.c b/sound/pci/hda/patch_hdmi.c index 5fc9ff31b1c5..3fc259154c0b 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,