diff options
| author | Anssi Hannula <anssi.hannula@iki.fi> | 2013-10-05 02:25:43 +0300 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2013-10-07 12:49:13 +0200 |
| commit | bb731f2100e614a8d7c5965d3663aed893859733 (patch) | |
| tree | fd5a3b15e8041f747795915fd81b61d9cb4daa4e /sound/pci/hda/patch_hdmi.c | |
| parent | a5b7d510b2220cccbcaeb1b87a6d8c47efeb154c (diff) | |
| download | linux-bb731f2100e614a8d7c5965d3663aed893859733.tar.gz linux-bb731f2100e614a8d7c5965d3663aed893859733.tar.bz2 linux-bb731f2100e614a8d7c5965d3663aed893859733.zip | |
ALSA: hda - hdmi: Fix available channel maps missing from TLV
Currently the available channel maps TLV only contains channel maps that
are limited to the traditional 7.1 speakers.
Since the other HDMI channel mapping functions have been fixed to
properly handle all CEA-861-E specified speakers, allow them to be
listed.
Signed-off-by: Anssi Hannula <anssi.hannula@iki.fi>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/pci/hda/patch_hdmi.c')
| -rw-r--r-- | sound/pci/hda/patch_hdmi.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/sound/pci/hda/patch_hdmi.c b/sound/pci/hda/patch_hdmi.c index dab2af762d94..62b1e852d002 100644 --- a/sound/pci/hda/patch_hdmi.c +++ b/sound/pci/hda/patch_hdmi.c @@ -1658,8 +1658,6 @@ static int hdmi_chmap_ctl_tlv(struct snd_kcontrol *kcontrol, int op_flag, struct snd_pcm_chmap *info = snd_kcontrol_chip(kcontrol); struct hda_codec *codec = info->private_data; struct hdmi_spec *spec = codec->spec; - const unsigned int valid_mask = - FL | FR | RL | RR | LFE | FC | RLC | RRC; unsigned int __user *dst; int chs, count = 0; @@ -1677,8 +1675,6 @@ static int hdmi_chmap_ctl_tlv(struct snd_kcontrol *kcontrol, int op_flag, int chs_bytes = chs * 4; if (cap->channels != chs) continue; - if (cap->spk_mask & ~valid_mask) - continue; if (size < 8) return -ENOMEM; if (put_user(SNDRV_CTL_TLVT_CHMAP_VAR, dst) || |