summaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorWu Fengguang <fengguang.wu@intel.com>2009-11-18 12:38:07 +0800
committerTakashi Iwai <tiwai@suse.de>2009-11-18 07:46:36 +0100
commit81bf31e2d0a6a9f5d83da0a757f8ca03db908162 (patch)
tree62555fb757a1abd72bbe1b82e1327b171d07d2f1 /sound
parent5779191e0efd851fb0d54698c13cb4f5325caca6 (diff)
downloadtalos-op-linux-81bf31e2d0a6a9f5d83da0a757f8ca03db908162.tar.gz
talos-op-linux-81bf31e2d0a6a9f5d83da0a757f8ca03db908162.zip
ALSA: intelhdmi - sticky channel count
Don't change channel count if not necessary. Signed-off-by: Wu Fengguang <fengguang.wu@intel.com> Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound')
-rw-r--r--sound/pci/hda/patch_intelhdmi.c10
1 files changed, 2 insertions, 8 deletions
diff --git a/sound/pci/hda/patch_intelhdmi.c b/sound/pci/hda/patch_intelhdmi.c
index 8a1cf9d7e5ce..928df59be5d8 100644
--- a/sound/pci/hda/patch_intelhdmi.c
+++ b/sound/pci/hda/patch_intelhdmi.c
@@ -422,24 +422,18 @@ static void hdmi_stop_infoframe_trans(struct hda_codec *codec,
AC_DIPXMIT_DISABLE);
}
-#ifdef CONFIG_SND_DEBUG_VERBOSE
static int hdmi_get_channel_count(struct hda_codec *codec, hda_nid_t nid)
{
return 1 + snd_hda_codec_read(codec, nid, 0,
AC_VERB_GET_CVT_CHAN_COUNT, 0);
}
-#endif
static void hdmi_set_channel_count(struct hda_codec *codec,
hda_nid_t nid, int chs)
{
- snd_hda_codec_write(codec, nid, 0, AC_VERB_SET_CVT_CHAN_COUNT, chs - 1);
-
-#ifdef CONFIG_SND_DEBUG_VERBOSE
if (chs != hdmi_get_channel_count(codec, nid))
- snd_printd(KERN_INFO "HDMI channel count: expect %d, get %d\n",
- chs, hdmi_get_channel_count(codec, nid));
-#endif
+ snd_hda_codec_write(codec, nid, 0,
+ AC_VERB_SET_CVT_CHAN_COUNT, chs - 1);
}
static void hdmi_debug_channel_mapping(struct hda_codec *codec, hda_nid_t nid)
OpenPOWER on IntegriCloud