Merge "ASoC: bg: Fix incorrect num_session update" (c13ff6b5) · Commits · e / devices / android_kernel_xiaomi_markw

sound/soc/codecs/bg_codec.c

+14 −12

Original line number	Diff line number	Diff line
		@@ -326,6 +326,20 @@ static int _bg_codec_start(struct bg_cdc_priv *bg_cdc, int dai_id)
		pr_err("%s:Invalid dai id %d", __func__, dai_id);
		return -EINVAL;
		}

		mutex_lock(&bg_cdc->bg_cdc_lock);
		if (bg_cdc->num_sessions == 0) {
		/* set regulator to normal mode */
		ret = regulator_set_optimum_mode(bg_cdc->spkr_vreg, 100000);
		if (ret < 0) {
		pr_err("Fail to set spkr_vreg mode%d\n", ret);
		mutex_unlock(&bg_cdc->bg_cdc_lock);
		return ret;
		}
		}
		bg_cdc->num_sessions++;
		mutex_unlock(&bg_cdc->bg_cdc_lock);

		codec_start.route_to_bg = bg_cdc->src[dai_id];
		pr_debug("%s active_session %x route_to_bg %d\n",
		__func__, codec_start.active_session, codec_start.route_to_bg);
		@@ -631,18 +645,6 @@ static int bg_cdc_prepare(struct snd_pcm_substream *substream,
		return -EINVAL;
		}

		mutex_lock(&bg_cdc->bg_cdc_lock);
		if (bg_cdc->num_sessions == 0) {
		/* set regulator to normal mode */
		ret = regulator_set_optimum_mode(bg_cdc->spkr_vreg, 100000);
		if (ret < 0) {
		pr_err("Fail to set spkr_vreg mode%d\n", ret);
		mutex_unlock(&bg_cdc->bg_cdc_lock);
		return ret;
		}
		}
		bg_cdc->num_sessions++;
		mutex_unlock(&bg_cdc->bg_cdc_lock);
		/* Send command to BG to start session */
		ret = _bg_codec_start(bg_cdc, dai->id);
		if (ret < 0)