summaryrefslogtreecommitdiffstats
path: root/sound/pci
diff options
context:
space:
mode:
authorTakashi Iwai2013-06-18 16:14:22 +0200
committerTakashi Iwai2013-06-18 16:14:22 +0200
commitbddee96b5d0db869f47b195fe48c614ca824203c (patch)
treed89eb2e6173edff5523222d4021b173ee375d516 /sound/pci
parentALSA: firewire: fix error return code in scs_probe() (diff)
downloadkernel-qcow2-linux-bddee96b5d0db869f47b195fe48c614ca824203c.tar.gz
kernel-qcow2-linux-bddee96b5d0db869f47b195fe48c614ca824203c.tar.xz
kernel-qcow2-linux-bddee96b5d0db869f47b195fe48c614ca824203c.zip
ALSA: hda - Cache the MUX selection for generic HDMI
When a selection to a converter MUX is changed in hdmi_pcm_open(), it should be cached so that the given connection can be restored properly at PM resume. We need just to replace the corresponding snd_hda_codec_write() call with snd_hda_codec_write_cache(). Cc: <stable@vger.kernel.org> Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/pci')
-rw-r--r--sound/pci/hda/patch_hdmi.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/pci/hda/patch_hdmi.c b/sound/pci/hda/patch_hdmi.c
index 8983747f2a37..844cf55a62b1 100644
--- a/sound/pci/hda/patch_hdmi.c
+++ b/sound/pci/hda/patch_hdmi.c
@@ -1155,7 +1155,7 @@ static int hdmi_pcm_open(struct hda_pcm_stream *hinfo,
per_cvt->assigned = 1;
hinfo->nid = per_cvt->cvt_nid;
- snd_hda_codec_write(codec, per_pin->pin_nid, 0,
+ snd_hda_codec_write_cache(codec, per_pin->pin_nid, 0,
AC_VERB_SET_CONNECT_SEL,
mux_idx);
snd_hda_spdif_ctls_assign(codec, pin_idx, per_cvt->cvt_nid);