ASoC: tlv320aic32x4 fix initialization of micpga routing (23524eb1) · Commits · 戴 / test

Checking the pdata-flags used 'or', so the check is always true. Use 'and' to correctly mask the flags. Signed-off-by:

Wolfram Sang <w.sang@pengutronix.de> Cc: Javier Martin <javier.martin@vista-silicon.com> Cc: Liam Girdwood <lrg@ti.com> Cc: Mark Brown <broonie@opensource.wolfsonmicro.com> Signed-off-by:

Mark Brown <broonie@opensource.wolfsonmicro.com>

sound/soc/codecs/tlv320aic32x4.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -685,10 +685,10 @@ static int aic32x4_probe(struct snd_soc_codec *codec)
		}

		/* Mic PGA routing */
		if (aic32x4->micpga_routing \| AIC32X4_MICPGA_ROUTE_LMIC_IN2R_10K) {
		if (aic32x4->micpga_routing & AIC32X4_MICPGA_ROUTE_LMIC_IN2R_10K) {
		snd_soc_write(codec, AIC32X4_LMICPGANIN, AIC32X4_LMICPGANIN_IN2R_10K);
		}
		if (aic32x4->micpga_routing \| AIC32X4_MICPGA_ROUTE_RMIC_IN1L_10K) {
		if (aic32x4->micpga_routing & AIC32X4_MICPGA_ROUTE_RMIC_IN1L_10K) {
		snd_soc_write(codec, AIC32X4_RMICPGANIN, AIC32X4_RMICPGANIN_IN1L_10K);
		}

Admin message