evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "ASoC: msm: qdsp6v2: add memset of adm open before usage"

Browse source
This commit is contained in:
Linux Build Service Account 2017-03-07 06:25:06 -08:00 • committed by Gerrit - the friendly Code Review server
commit 9695aa22f6
1 changed files with 3 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
sound/soc/msm/qdsp6v2/q6adm.c
View file

@ -2463,6 +2463,7 @@ int adm_open(int port_id, int path, int rate, int channel_mode, int topology,
pr_err("%s: DTS_EAGLE mmap did not work!", pr_err("%s: DTS_EAGLE mmap did not work!",
__func__); __func__);
} }
memset(&open, 0, sizeof(struct adm_cmd_device_open_v5));
open.hdr.hdr_field = APR_HDR_FIELD(APR_MSG_TYPE_SEQ_CMD, open.hdr.hdr_field = APR_HDR_FIELD(APR_MSG_TYPE_SEQ_CMD,
APR_HDR_LEN(APR_HDR_SIZE), APR_HDR_LEN(APR_HDR_SIZE),
APR_PKT_VER); APR_PKT_VER);
@ -2506,6 +2507,8 @@ int adm_open(int port_id, int path, int rate, int channel_mode, int topology,
if ((this_adm.num_ec_ref_rx_chans != 0) && (path != 1) && if ((this_adm.num_ec_ref_rx_chans != 0) && (path != 1) &&
(open.endpoint_id_2 != 0xFFFF)) { (open.endpoint_id_2 != 0xFFFF)) {
memset(&open_v6, 0,
sizeof(struct adm_cmd_device_open_v6));
memcpy(&open_v6, &open, memcpy(&open_v6, &open,
sizeof(struct adm_cmd_device_open_v5)); sizeof(struct adm_cmd_device_open_v5));
open_v6.hdr.opcode = ADM_CMD_DEVICE_OPEN_V6; open_v6.hdr.opcode = ADM_CMD_DEVICE_OPEN_V6;