summaryrefslogtreecommitdiff
authorJian Xu <jian.xu@amlogic.com>2016-07-21 07:49:13 (GMT)
committer Gerrit Code Review <gituser@scgit.amlogic.com>2016-07-21 07:49:13 (GMT)
commit2a752ecfe96fc0e0f80eebfa0a4208854406cc42 (patch)
tree2a89841616e93a633901829ba2e49fa7a2346a8c
parent2ad27d856d9a002a8badb47506fcba21a80ca029 (diff)
parentebb729528a71a9aa0c98bd1bef58681a3ac4d003 (diff)
downloadaudio-2a752ecfe96fc0e0f80eebfa0a4208854406cc42.zip
audio-2a752ecfe96fc0e0f80eebfa0a4208854406cc42.tar.gz
audio-2a752ecfe96fc0e0f80eebfa0a4208854406cc42.tar.bz2
Merge "PD#128794: audio: fix 6 ch LPCM hdmi reset audio parameter noise" into m-amlogic
Diffstat
-rw-r--r--hdmi_audio_hw.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/hdmi_audio_hw.c b/hdmi_audio_hw.c
index 9b762bb..80f6226 100644
--- a/hdmi_audio_hw.c
+++ b/hdmi_audio_hw.c
@@ -460,7 +460,9 @@ out_standby(struct audio_stream *stream)
status = do_output_standby(out);
set_codec_type(TYPE_PCM);
/* clear the hdmitx channel config to default */
- sysfs_set_sysfs_str("/sys/class/amhdmitx/amhdmitx0/aud_output_chs", "0:0");
+ if (out->multich == 6) {
+ sysfs_set_sysfs_str("/sys/class/amhdmitx/amhdmitx0/aud_output_chs", "0:0");
+ }
if (out->format != AUDIO_FORMAT_DTS_HD)
set_codec_type(TYPE_PCM);
pthread_mutex_unlock(&out->lock);