torvalds/linux
torvalds/linux
2
0
Fork 0
mirror of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-09-04 20:19:47 +08:00
Code

ALSA: HDMI - Fix channel_allocation array wrong order

Browse Source 
The array channel_allocations[] is an ordered list, add function to get
correct order by ca_index.

Signed-off-by: Wang Xingchao <xingchao.wang@intel.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
Wang Xingchao 2012-09-06 10:02:36 +08:00 committed by Takashi Iwai
parent 14e4291721
commit 72357c78b7
1 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
sound/pci/hda/patch_hdmi.c
View File

@ -469,6 +469,17 @@ static void init_channel_allocations(void)
} }
} }
static int get_channel_allocation_order(int ca)
{
int i;
for (i = 0; i < ARRAY_SIZE(channel_allocations); i++) {
if (channel_allocations[i].ca_index == ca)
break;
}
return i;
}
/* /*
* The transformation takes two steps: * The transformation takes two steps:
* *
@ -541,9 +552,11 @@ static void hdmi_setup_channel_mapping(struct hda_codec *codec,
{ {
int i; int i;
int err; int err;
int order;
order = get_channel_allocation_order(ca);
if (hdmi_channel_mapping[ca][1] == 0) { if (hdmi_channel_mapping[ca][1] == 0) {
for (i = 0; i < channel_allocations[ca].channels; i++) for (i = 0; i < channel_allocations[order].channels; i++)
hdmi_channel_mapping[ca][i] = i | (i << 4); hdmi_channel_mapping[ca][i] = i | (i << 4);
for (; i < 8; i++) for (; i < 8; i++)
hdmi_channel_mapping[ca][i] = 0xf | (i << 4); hdmi_channel_mapping[ca][i] = 0xf | (i << 4);