Merge "ASoC: msm: bg: Fix mutex_unlock to avoid deadlock" (d457b54d) · Commits · e / devices / android_kernel_xiaomi_markw

sound/soc/codecs/pktzr.c

+3 −1

Original line number	Diff line number	Diff line
		@@ -138,6 +138,7 @@ static int pktzr_send_pkt(void payload, uint32_t size, void rsp,
		INIT_LIST_HEAD(&pnode->list);
		pr_debug("ppriv->token = %d\n", ppriv->token);
		list_add_tail(&pnode->list, &ppriv->ch_list);
		mutex_unlock(&ppriv->pktzr_lock);

		if (cmd == PKTZR_CMD_DATA)
		rc = bg_cdc_glink_write(ppriv->ch_info[1], pkt_hdr, pkt_size);
		@@ -151,7 +152,6 @@ static int pktzr_send_pkt(void payload, uint32_t size, void rsp,

		if (sync_cmd) {
		pr_debug("%s: command sent waiting!\n", __func__);
		mutex_unlock(&ppriv->pktzr_lock);
		rc = wait_for_completion_timeout(&ppriv->thread_complete,
		MSM_BG_THREAD_TIMEOUT);
		if (!rc) {
		@@ -169,10 +169,12 @@ static int pktzr_send_pkt(void payload, uint32_t size, void rsp,
		exit:
		/* Free memory */
		kfree(pkt_hdr);
		mutex_lock(&ppriv->pktzr_lock);
		if (pnode) {
		list_del(&pnode->list);
		kfree(pnode);
		}
		mutex_unlock(&ppriv->pktzr_lock);
		return rc;
		}