Merge "dsp: q6asm: fix consecutive cal_memory unmap failure" (a9926e43) · Commits · e / devices / android_kernel_fairphone_FP5

dsp/q6asm.c

+3 −1

Original line number	Diff line number	Diff line
		@@ -751,7 +751,7 @@ static int q6asm_map_cal_memory(int32_t cal_type,
		goto done;
		}

		/* Use second asm buf to map memory */
		/* Use first asm buf to map memory */
		if (common_client.port[IN].buf == NULL) {
		pr_err("%s: common buf is NULL\n",
		__func__);
		@@ -842,6 +842,8 @@ static int q6asm_unmap_cal_memory(int32_t cal_type,
		}
		}

		common_client.port[IN].buf->phys = cal_block->cal_data.paddr;

		result2 = q6asm_memory_unmap_regions(&common_client, IN);
		if (result2 < 0) {
		pr_err("%s: unmap failed, err %d\n",