A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-10-09 05:39:54 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge "asoc: avoid excessive logging"

Browse source
This commit is contained in:
Linux Build Service Account 2019-03-14 06:55:13 -07:00 • committed by Gerrit - the friendly Code Review server
commit 59342f5264
2 changed files with 6 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

4
asoc/msm-compress-q6-v2.c
View file

@ -2788,12 +2788,10 @@ static int msm_compr_pointer(struct snd_compr_stream *cstream,
rc = q6asm_get_session_time(
prtd->audio_client, &prtd->marker_timestamp);
if (rc < 0) {
pr_err("%s: Get Session Time return =%lld\n",
__func__, timestamp);
if (atomic_read(&prtd->error))
return -ENETRESET;
else
return -EAGAIN;
return rc;
}
}
} else {

9
dsp/q6asm.c
View file

@ -9644,16 +9644,17 @@ int q6asm_get_session_time(struct audio_client *ac, uint64_t *tstamp)
ac->session, mtmx_params.hdr.opcode);
rc = apr_send_pkt(ac->apr, (uint32_t *) &mtmx_params);
if (rc < 0) {
pr_err("%s: Commmand 0x%x failed %d\n", __func__,
mtmx_params.hdr.opcode, rc);
goto fail_cmd;
dev_err_ratelimited(ac->dev, "%s: Get Session Time failed %d\n",
__func__, rc);
return rc;
}
rc = wait_event_timeout(ac->time_wait,
(atomic_read(&ac->time_flag) == 0),
msecs_to_jiffies(TIMEOUT_MS));
if (!rc) {
pr_err("%s: timeout in getting session time from DSP\n",
__func__);
__func__);
goto fail_cmd;
}