From 6eab01617c8f40351bdb2c59ccca17593d3e7a08 Mon Sep 17 00:00:00 2001 From: Wu Fengguang Date: Sat, 22 Nov 2008 09:40:52 +0800 Subject: [PATCH] --- yaml --- r: 120491 b: refs/heads/master c: cc02b83c904592ce8714787094256a9bf8e24b6f h: refs/heads/master i: 120489: 6d026b5289e3ea923205213132e5ccee2938047a 120487: 32831ca2c864367b6ba80ade40362a0727419fef v: v3 --- [refs] | 2 +- trunk/sound/pci/hda/patch_intelhdmi.c | 10 ++++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 5a6eed5095e6..7e4bd2b8d69a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b83923a3931a43df7397a7491f0c9d9b9d46624a +refs/heads/master: cc02b83c904592ce8714787094256a9bf8e24b6f diff --git a/trunk/sound/pci/hda/patch_intelhdmi.c b/trunk/sound/pci/hda/patch_intelhdmi.c index e10fa1e3dc9b..4a48011ae35b 100644 --- a/trunk/sound/pci/hda/patch_intelhdmi.c +++ b/trunk/sound/pci/hda/patch_intelhdmi.c @@ -444,14 +444,16 @@ static int hdmi_setup_channel_allocation(struct hda_codec *codec, (spk_mask & channel_allocations[i].spk_mask) == channel_allocations[i].spk_mask) { ai->CA = channel_allocations[i].ca_index; - return 0; + break; } } snd_print_channel_allocation(eld->spk_alloc, buf, sizeof(buf)); - snd_printd(KERN_INFO "failed to setup channel allocation: %d of %s\n", - channels, buf); - return -1; + snd_printdd(KERN_INFO + "HDMI: select CA 0x%x for %d-channel allocation: %s\n", + ai->CA, channels, buf); + + return ai->CA; } static void hdmi_setup_channel_mapping(struct hda_codec *codec,