aboutsummaryrefslogtreecommitdiffstats
path: root/sound/pci/hda/patch_hdmi.c
diff options
context:
space:
mode:
authorAnssi Hannula <anssi.hannula@iki.fi>2013-10-04 19:25:43 -0400
committerTakashi Iwai <tiwai@suse.de>2013-10-07 06:49:13 -0400
commitbb731f2100e614a8d7c5965d3663aed893859733 (patch)
treefd5a3b15e8041f747795915fd81b61d9cb4daa4e /sound/pci/hda/patch_hdmi.c
parenta5b7d510b2220cccbcaeb1b87a6d8c47efeb154c (diff)
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.c4
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,
1658 struct snd_pcm_chmap *info = snd_kcontrol_chip(kcontrol); 1658 struct snd_pcm_chmap *info = snd_kcontrol_chip(kcontrol);
1659 struct hda_codec *codec = info->private_data; 1659 struct hda_codec *codec = info->private_data;
1660 struct hdmi_spec *spec = codec->spec; 1660 struct hdmi_spec *spec = codec->spec;
1661 const unsigned int valid_mask =
1662 FL | FR | RL | RR | LFE | FC | RLC | RRC;
1663 unsigned int __user *dst; 1661 unsigned int __user *dst;
1664 int chs, count = 0; 1662 int chs, count = 0;
1665 1663
@@ -1677,8 +1675,6 @@ static int hdmi_chmap_ctl_tlv(struct snd_kcontrol *kcontrol, int op_flag,
1677 int chs_bytes = chs * 4; 1675 int chs_bytes = chs * 4;
1678 if (cap->channels != chs) 1676 if (cap->channels != chs)
1679 continue; 1677 continue;
1680 if (cap->spk_mask & ~valid_mask)
1681 continue;
1682 if (size < 8) 1678 if (size < 8)
1683 return -ENOMEM; 1679 return -ENOMEM;
1684 if (put_user(SNDRV_CTL_TLVT_CHMAP_VAR, dst) || 1680 if (put_user(SNDRV_CTL_TLVT_CHMAP_VAR, dst) ||