diff options
| author | Linux Build Service Account <lnxbuild@quicinc.com> | 2017-05-10 23:03:58 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2017-05-10 23:03:58 -0700 |
| commit | df2fff8d1d07b210707b44fca29c396b0a480027 (patch) | |
| tree | f9c1e26dffbcdc2c389f8d527dcf1d7c54661fcc /sound | |
| parent | abb1d6bee641b1c711d9179850b3343a2ea55190 (diff) | |
| parent | 4d021085de9cb93f1109e171c8308ce27100d66e (diff) | |
Merge "ASoC: msm: qdsp6v2: Add TrueHD to compressed open"
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/soc/msm/qdsp6v2/q6asm.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/sound/soc/msm/qdsp6v2/q6asm.c b/sound/soc/msm/qdsp6v2/q6asm.c index fe826cbcf111..4aebcb6fa77e 100644 --- a/sound/soc/msm/qdsp6v2/q6asm.c +++ b/sound/soc/msm/qdsp6v2/q6asm.c @@ -2609,7 +2609,9 @@ int q6asm_open_write_compressed(struct audio_client *ac, uint32_t format, case FORMAT_GEN_COMPR: open.fmt_id = ASM_MEDIA_FMT_GENERIC_COMPRESSED; break; - + case FORMAT_TRUEHD: + open.fmt_id = ASM_MEDIA_FMT_TRUEHD; + break; default: pr_err("%s: Invalid format[%d]\n", __func__, format); rc = -EINVAL; @@ -2782,9 +2784,6 @@ static int __q6asm_open_write(struct audio_client *ac, uint32_t format, case FORMAT_GEN_COMPR: open.dec_fmt_id = ASM_MEDIA_FMT_GENERIC_COMPRESSED; break; - case FORMAT_TRUEHD: - open.dec_fmt_id = ASM_MEDIA_FMT_TRUEHD; - break; default: pr_err("%s: Invalid format 0x%x\n", __func__, format); rc = -EINVAL; |