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

ASoC: msm: qdsp6v2: Modify wait event and cmd state check

Browse source 
Modify wait event and cmd state condition check for positive
integer as adsp returns  positive error number.

CRs-fixed: 1074954
Change-Id: Id2be933de4072f3953536c9a2b75f08763352673
Signed-off-by: Yamit Mehta <ymehta@codeaurora.org>
This commit is contained in:
Yamit Mehta 2016-10-04 18:19:13 +05:30 • committed by Gerrit - the friendly Code Review server
parent a80e267a8c
commit c19aa430f8
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
sound/soc/msm/qdsp6v2/q6asm.c
View file

@ -8326,7 +8326,7 @@ int q6asm_send_cal(struct audio_client *ac)
q6asm_add_hdr_async(ac, &hdr, (sizeof(struct apr_hdr) + q6asm_add_hdr_async(ac, &hdr, (sizeof(struct apr_hdr) +
sizeof(struct asm_stream_cmd_set_pp_params_v2)), TRUE); sizeof(struct asm_stream_cmd_set_pp_params_v2)), TRUE);
atomic_set(&ac->cmd_state, 1); atomic_set(&ac->cmd_state, -1);
hdr.opcode = ASM_STREAM_CMD_SET_PP_PARAMS_V2; hdr.opcode = ASM_STREAM_CMD_SET_PP_PARAMS_V2;
payload_params.data_payload_addr_lsw = payload_params.data_payload_addr_lsw =
lower_32_bits(cal_block->cal_data.paddr); lower_32_bits(cal_block->cal_data.paddr);
@ -8352,13 +8352,13 @@ int q6asm_send_cal(struct audio_client *ac)
goto free; goto free;
} }
rc = wait_event_timeout(ac->cmd_wait, rc = wait_event_timeout(ac->cmd_wait,
(atomic_read(&ac->cmd_state) <= 0), 5 * HZ); (atomic_read(&ac->cmd_state) >= 0), 5 * HZ);
if (!rc) { if (!rc) {
pr_err("%s: timeout, audio audstrm cal send\n", __func__); pr_err("%s: timeout, audio audstrm cal send\n", __func__);
rc = -ETIMEDOUT; rc = -ETIMEDOUT;
goto free; goto free;
} }
if (atomic_read(&ac->cmd_state) < 0) { if (atomic_read(&ac->cmd_state) > 0) {
pr_err("%s: DSP returned error[%d] audio audstrm cal send\n", pr_err("%s: DSP returned error[%d] audio audstrm cal send\n",
__func__, atomic_read(&ac->cmd_state)); __func__, atomic_read(&ac->cmd_state));
rc = -EINVAL; rc = -EINVAL;