Merge "ASoC: msm: qdsp6v2: Fix memory corruption in ASM driver" (2305e21a) · Commits · e / devices / android_kernel_sony_msm8994

sound/soc/msm/qdsp6v2/q6asm.c

+1 −6

Original line number	Diff line number	Diff line
		@@ -1204,11 +1204,7 @@ static int32_t q6asm_srvc_callback(struct apr_client_data data, void priv)
		payload = data->payload;

		if (data->opcode == RESET_EVENTS) {
		struct audio_client ac_mmap = (struct audio_client )priv;
		if (ac_mmap == NULL) {
		pr_err("%s ac or priv NULL\n", __func__);
		return -EINVAL;
		}

		pr_debug("%s: Reset event is received: %d %d apr[%p]\n",
		__func__,
		data->reset_event,
		@@ -1217,7 +1213,6 @@ static int32_t q6asm_srvc_callback(struct apr_client_data data, void priv)
		atomic_set(&this_mmap.ref_cnt, 0);
		apr_reset(this_mmap.apr);
		this_mmap.apr = NULL;
		ac_mmap->mmap_apr = NULL;
		for (; i <= OUT; i++) {
		list_for_each_safe(ptr, next,
		&common_client.port[i].mem_map_handle) {