ASoC: qcom: lpass-cpu: fix concurrency issue (753a6e17) · Commits · 戴 / test

i2sctl register value is set to 0 during hw_free(). This impacts any ongoing concurrent session on the same i2s port. As trigger() stop already resets enable bit to 0, there is no need of explicit hw_free. Removing it to fix the issue. Fixes: ("ASoC: qcom: Add LPASS CPU DAI driver") Signed-off-by:

Rohit kumar <rohitkr@codeaurora.org> Reviewed-by:

Srinivas Kandagatla <srinivas.kandagatla@linaro.org> Link: https://lore.kernel.org/r/1597402388-14112-7-git-send-email-rohitkr@codeaurora.org Signed-off-by:

Mark Brown <broonie@kernel.org>

sound/soc/qcom/lpass-cpu.c

+0 −16

Original line number	Diff line number	Diff line
		@@ -266,21 +266,6 @@ static int lpass_cpu_daiops_hw_params(struct snd_pcm_substream *substream,
		return 0;
		}

		static int lpass_cpu_daiops_hw_free(struct snd_pcm_substream *substream,
		struct snd_soc_dai *dai)
		{
		struct lpass_data *drvdata = snd_soc_dai_get_drvdata(dai);
		int ret;

		ret = regmap_write(drvdata->lpaif_map,
		LPAIF_I2SCTL_REG(drvdata->variant, dai->driver->id),
		0);
		if (ret)
		dev_err(dai->dev, "error writing to i2sctl reg: %d\n", ret);

		return ret;
		}

		static int lpass_cpu_daiops_prepare(struct snd_pcm_substream *substream,
		struct snd_soc_dai *dai)
		{
		@@ -350,7 +335,6 @@ const struct snd_soc_dai_ops asoc_qcom_lpass_cpu_dai_ops = {
		.startup = lpass_cpu_daiops_startup,
		.shutdown = lpass_cpu_daiops_shutdown,
		.hw_params = lpass_cpu_daiops_hw_params,
		.hw_free = lpass_cpu_daiops_hw_free,
		.prepare = lpass_cpu_daiops_prepare,
		.trigger = lpass_cpu_daiops_trigger,
		};

Admin message