msm: qdsp6v2: set device channels on vocproc
Media format data is used only to account for additional buffering
required in vocproc when a fractional sample rate is set. Set device
channels irrespective of the media format info in order to configure
the input no of channels when a custom topology is used.
CRs-Fixed: 1116092
Change-Id: I6eadba65dbed102aec085d99f28c39e66ea4b89b
Signed-off-by: Siena Richard <sienar@codeaurora.org>
diff --git a/sound/soc/msm/qdsp6v2/q6voice.c b/sound/soc/msm/qdsp6v2/q6voice.c
index b7cdd8f..b829c65 100644
--- a/sound/soc/msm/qdsp6v2/q6voice.c
+++ b/sound/soc/msm/qdsp6v2/q6voice.c
@@ -3962,6 +3962,10 @@
{
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);
@@ -3974,8 +3978,6 @@
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: