Merge "dsp: ensure unassign memory happen when pause voice call failed" (c8f7b510) · Commits · e / devices / android_kernel_fairphone_FP5

dsp/q6voice.c

+12 −12

Original line number	Diff line number	Diff line
		@@ -3945,7 +3945,8 @@ static int voice_unmap_cal_memory(int32_t cal_type,
		__func__, v->session_id, result2);

		result = result2;
		} else {
		}

		if (cal_type == CVP_VOCPROC_DYNAMIC_CAL_TYPE)
		voice_send_cvp_deregister_vol_cal_cmd(v);
		else if (cal_type == CVP_VOCPROC_STATIC_CAL_TYPE)
		@@ -3957,7 +3958,6 @@ static int voice_unmap_cal_memory(int32_t cal_type,
		else
		pr_err("%s: Invalid cal type %d!\n",
		__func__, cal_type);
		}

		result2 = voice_send_start_voice_cmd(v);
		if (result2) {