summaryrefslogtreecommitdiffstats
path: root/sound/pci/hda
diff options
context:
space:
mode:
authorWu Fengguang <wfg@linux.intel.com>2008-11-22 09:40:52 +0800
committerTakashi Iwai <tiwai@suse.de>2008-11-22 11:14:32 +0100
commitcc02b83c904592ce8714787094256a9bf8e24b6f (patch)
treeddf4dacbbeb1be5e3418d43b69136085970816a1 /sound/pci/hda
parentb83923a3931a43df7397a7491f0c9d9b9d46624a (diff)
ALSA: hda - report selected CA index for Audio InfoFrame
Print some CA selecting info, which could be valuable for debugging when something goes wrong. Signed-off-by: Wu Fengguang <wfg@linux.intel.com> Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/pci/hda')
-rw-r--r--sound/pci/hda/patch_intelhdmi.c10
1 files changed, 6 insertions, 4 deletions
diff --git a/sound/pci/hda/patch_intelhdmi.c b/sound/pci/hda/patch_intelhdmi.c
index e10fa1e3dc9..4a48011ae35 100644
--- a/sound/pci/hda/patch_intelhdmi.c
+++ b/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,