diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2017-02-03 06:27:00 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2017-02-03 06:26:59 -0800 |
| commit | 4db174025d4e9307cf40969f7b5a453111f2fb61 (patch) | |
| tree | 2fc2ce42bcf1500e0791d0ea5c8ab7f95b2dc3fa /sound/soc | |
| parent | 33d448626003f724f0d6aa23d92c85730419d205 (diff) | |
| parent | 6445f4d48324e04d6e404c85940473d100584d22 (diff) | |
Merge "msm: qdsp6v2: set device channels on vocproc"
Diffstat (limited to 'sound/soc')
| -rw-r--r-- | sound/soc/msm/qdsp6v2/q6voice.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/sound/soc/msm/qdsp6v2/q6voice.c b/sound/soc/msm/qdsp6v2/q6voice.c index e7619c0ca0dd..d352133b7c32 100644 --- a/sound/soc/msm/qdsp6v2/q6voice.c +++ b/sound/soc/msm/qdsp6v2/q6voice.c @@ -3990,6 +3990,10 @@ static int voice_send_cvp_media_fmt_info_cmd(struct voice_data *v) { int ret; + ret = voice_send_cvp_device_channels_cmd(v); + if (ret < 0) + goto done; + if (voice_get_cvd_int_version(common.cvd_version) >= CVD_INT_VERSION_2_3) { ret = voice_send_cvp_media_format_cmd(v, RX_PATH); @@ -4002,8 +4006,6 @@ static int voice_send_cvp_media_fmt_info_cmd(struct voice_data *v) if (common.ec_ref_ext) ret = voice_send_cvp_media_format_cmd(v, EC_REF_PATH); - } else { - ret = voice_send_cvp_device_channels_cmd(v); } done: |