mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-24 01:41:39 +00:00
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>
This commit is contained in:
parent
4061db03dd
commit
028cb68ee3
1 changed files with 6 additions and 2 deletions
|
@ -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,
|
||||
|
|
Loading…
Reference in a new issue