summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinux Build Service Account <lnxbuild@localhost>2018-02-14 05:30:58 -0800
committerGerrit - the friendly Code Review server <code-review@localhost>2018-02-14 05:30:58 -0800
commitc69f889e8557f8fb84f6ab2eee94f22a17771aac (patch)
treecb4a34ff408cf18bd65d67b11efd67613d01c526
parent26c7349d3aa3d6360210b415dc3e5691a9203322 (diff)
parent7e2b30f53ad1402f71dc3bb32ca936ba423f3e1c (diff)
Merge "ASoC: msm: qdsp6v2: Fix memory allocation issue in afe_sidetone"
-rw-r--r--sound/soc/msm/qdsp6v2/q6afe.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/sound/soc/msm/qdsp6v2/q6afe.c b/sound/soc/msm/qdsp6v2/q6afe.c
index d0c1677acb16..96580207e676 100644
--- a/sound/soc/msm/qdsp6v2/q6afe.c
+++ b/sound/soc/msm/qdsp6v2/q6afe.c
@@ -4922,6 +4922,13 @@ static int afe_sidetone(u16 tx_port_id, u16 rx_port_id, bool enable)
mid = st_cal_info->mid;
mutex_unlock(&this_afe.cal_data[cal_index]->lock);
+ packed_param_size =
+ sizeof(param_hdr) * 2 + sizeof(gain_data) + sizeof(cfg_data);
+ packed_param_data = kzalloc(packed_param_size, GFP_KERNEL);
+ if (!packed_param_data)
+ return -ENOMEM;
+ packed_param_size = 0;
+
/* Set gain data. */
param_hdr.module_id = AFE_MODULE_LOOPBACK;
param_hdr.instance_id = INSTANCE_ID_0;