Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit aa175583 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ASoC: wcd9335: Add support to connect codec dai to mixing path"

parents 4c3be7b8 411862d1

sound/soc/codecs/wcd9335.c

+26 −28
Original line number Diff line number Diff line
@@ -7870,7 +7870,6 @@ static int tasha_set_interpolator_rate(struct snd_soc_dai *dai, 
	int rate_val = 0;

	int i, ret;



	if (dai->id == AIF_MIX1_PB) {

	/* set mixing path rate */

	for (i = 0; i < ARRAY_SIZE(int_mix_sample_rate_val); i++) {

		if (sample_rate ==
@@ -7882,10 +7881,10 @@ static int tasha_set_interpolator_rate(struct snd_soc_dai *dai, 
	}

	if ((i == ARRAY_SIZE(int_mix_sample_rate_val)) ||

			(rate_val < 0))

			return -EINVAL;

		goto prim_rate;

	ret = tasha_set_mix_interpolator_rate(dai,

			(u8) rate_val, sample_rate);

	} else {

prim_rate:

	/* set primary path sample rate */

	for (i = 0; i < ARRAY_SIZE(int_prim_sample_rate_val); i++) {

		if (sample_rate ==
@@ -7900,7 +7899,6 @@ static int tasha_set_interpolator_rate(struct snd_soc_dai *dai, 
		return -EINVAL;

	ret = tasha_set_prim_interpolator_rate(dai,

			(u8) rate_val, sample_rate);

	}

	return ret;

}