Merge "ASoC: q6asm: fix the error during playback in ffbm" (a13d1584) · Commits · e / devices / android_kernel_sony_msm8994

sound/soc/msm/qdsp6v2/q6asm.c

+0 −3

Original line number	Diff line number	Diff line
		@@ -399,14 +399,12 @@ static int q6asm_map_cal_memory(struct cal_block_data *cal_block)
		if (cal_block == NULL) {
		pr_err("%s: cal_block is NULL!\n",
		__func__);
		result = -EINVAL;
		goto done;
		}

		if (cal_block->cal_data.paddr == 0) {
		pr_debug("%s: No address to map!\n",
		__func__);
		result = -EINVAL;
		goto done;
		}

		@@ -421,7 +419,6 @@ static int q6asm_map_cal_memory(struct cal_block_data *cal_block)
		if (cal_block->map_data.map_size == 0) {
		pr_debug("%s: map size is 0!\n",
		__func__);
		result = -EINVAL;
		goto done;
		}