summaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2011-01-14 10:33:26 +0100
committerTakashi Iwai <tiwai@suse.de>2011-01-14 10:33:26 +0100
commit4fe2ca14678174d9df254ae3ba2b79bacc19e2ee (patch)
treec7657ef4c57ac63fec7af1fb9f9d131972b060b4 /sound
parent639cef0eb6df05d5516520aa89b0c9fe62ee2d3b (diff)
downloadop-kernel-dev-4fe2ca14678174d9df254ae3ba2b79bacc19e2ee.zip
op-kernel-dev-4fe2ca14678174d9df254ae3ba2b79bacc19e2ee.tar.gz
ALSA: hda - More coverage for odd-number channels elimination for HDMI
The commit ad09fc9d2156f3d37537b34418a6b79309013d33 didn't cover the case for Intel and Nvidia HDMIs, where hdmi_pcm_open() is called. Put the hw_constraint there, too. Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound')
-rw-r--r--sound/pci/hda/patch_hdmi.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/sound/pci/hda/patch_hdmi.c b/sound/pci/hda/patch_hdmi.c
index 5980552..2d5b83f 100644
--- a/sound/pci/hda/patch_hdmi.c
+++ b/sound/pci/hda/patch_hdmi.c
@@ -850,6 +850,9 @@ static int hdmi_pcm_open(struct hda_pcm_stream *hinfo,
runtime->hw.channels_max = hinfo->channels_max;
runtime->hw.formats = hinfo->formats;
runtime->hw.rates = hinfo->rates;
+
+ snd_pcm_hw_constraint_step(substream->runtime, 0,
+ SNDRV_PCM_HW_PARAM_CHANNELS, 2);
return 0;
}
OpenPOWER on IntegriCloud