Merge "ASoC: msm: qdsp6v2: Initialize ASM no wait spinlock" (0153c0db) · Commits · e / devices / android_kernel_xiaomi_markw

sound/soc/msm/qdsp6v2/q6asm.c

+3 −1

Original line number	Diff line number	Diff line
		@@ -475,7 +475,7 @@ static bool q6asm_remove_nowait_opcode(struct audio_client *ac,
		}
		}

		pr_err("%s: nowait opcode NOT found 0x%x\n", __func__, opcode);
		pr_debug("%s: nowait opcode NOT found 0x%x\n", __func__, opcode);
		done:
		spin_unlock_irqrestore(&ac->no_wait_que_spinlock, flags);
		return ret;
		@@ -1122,6 +1122,7 @@ struct audio_client q6asm_audio_client_alloc(app_cb cb, void priv)
		}
		atomic_set(&ac->cmd_state, 0);
		atomic_set(&ac->nowait_cmd_cnt, 0);
		spin_lock_init(&ac->no_wait_que_spinlock);
		INIT_LIST_HEAD(&ac->no_wait_que);
		atomic_set(&ac->mem_state, 0);

		@@ -7122,6 +7123,7 @@ static int __init q6asm_init(void)
		}
		atomic_set(&common_client.cmd_state, 0);
		atomic_set(&common_client.nowait_cmd_cnt, 0);
		spin_lock_init(&common_client.no_wait_que_spinlock);
		INIT_LIST_HEAD(&common_client.no_wait_que);
		atomic_set(&common_client.mem_state, 0);