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

Merge "ASoC: APR: Fix missing APR deregister from asm"

Browse source
This commit is contained in:
Linux Build Service Account 2017-05-26 06:31:12 -07:00 • committed by Gerrit - the friendly Code Review server
commit 33a94f46e5
2 changed files with 8 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
drivers/soc/qcom/qdsp6v2/apr.c
View file

@ -745,13 +745,14 @@ int apr_deregister(void *handle)
if (!handle) if (!handle)
return -EINVAL; return -EINVAL;
mutex_lock(&svc->m_lock);
if (!svc->svc_cnt) { if (!svc->svc_cnt) {
pr_err("%s: svc already deregistered. svc = %pK\n", pr_err("%s: svc already deregistered. svc = %pK\n",
__func__, svc); __func__, svc);
mutex_unlock(&svc->m_lock);
return -EINVAL; return -EINVAL;
} }
mutex_lock(&svc->m_lock);
dest_id = svc->dest_id; dest_id = svc->dest_id;
client_id = svc->client_id; client_id = svc->client_id;
clnt = &client[dest_id][client_id]; clnt = &client[dest_id][client_id];

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

@ -1038,14 +1038,12 @@ void q6asm_audio_client_free(struct audio_client *ac)
} }
rtac_set_asm_handle(ac->session, NULL); rtac_set_asm_handle(ac->session, NULL);
if (!atomic_read(&ac->reset)) { apr_deregister(ac->apr2);
apr_deregister(ac->apr2); apr_deregister(ac->apr);
apr_deregister(ac->apr); q6asm_mmap_apr_dereg();
q6asm_mmap_apr_dereg(); ac->apr2 = NULL;
ac->apr2 = NULL; ac->apr = NULL;
ac->apr = NULL; ac->mmap_apr = NULL;
ac->mmap_apr = NULL;
}
q6asm_session_free(ac); q6asm_session_free(ac);
pr_debug("%s: APR De-Register\n", __func__); pr_debug("%s: APR De-Register\n", __func__);