提交 028cb68e 编写于 作者: S Subhransu S. Prusty 提交者: Takashi Iwai

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: 67b90cb8 ("ALSA: hda - Create common chmap object")
Reported-by: NAndreas Reis <andreas.reis@gmail.com>
Signed-off-by: NSubhransu S. Prusty <subhransu.s.prusty@intel.com>
Tested-by: NAndreas Reis <andreas.reis@gmail.com>
Signed-off-by: NVinod Koul <vinod.koul@intel.com>
Signed-off-by: NTakashi Iwai <tiwai@suse.de>
上级 4061db03
......@@ -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,
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册