Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 33a94f46 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

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

parents 38814e7f 8f0c7ae7

drivers/soc/qcom/qdsp6v2/apr.c

+2 −1
Original line number Diff line number Diff line
@@ -745,13 +745,14 @@ int apr_deregister(void *handle) 
	if (!handle)

		return -EINVAL;



	mutex_lock(&svc->m_lock);

	if (!svc->svc_cnt) {

		pr_err("%s: svc already deregistered. svc = %pK\n",

			__func__, svc);

		mutex_unlock(&svc->m_lock);

		return -EINVAL;

	}



	mutex_lock(&svc->m_lock);

	dest_id = svc->dest_id;

	client_id = svc->client_id;

	clnt = &client[dest_id][client_id];

sound/soc/msm/qdsp6v2/q6asm.c

+6 −8
Original line number Diff line number Diff line
@@ -1038,14 +1038,12 @@ void q6asm_audio_client_free(struct audio_client *ac) 
	}



	rtac_set_asm_handle(ac->session, NULL);

	if (!atomic_read(&ac->reset)) {

	apr_deregister(ac->apr2);

	apr_deregister(ac->apr);

	q6asm_mmap_apr_dereg();

	ac->apr2 = NULL;

	ac->apr = NULL;

	ac->mmap_apr = NULL;

	}

	q6asm_session_free(ac);



	pr_debug("%s: APR De-Register\n", __func__);