Merge branch 'for-3.1' into for-3.2

4f6d45f1 · Mark Brown · ac60155f · 23524eb1 · 4f6d45f1
隐藏空白更改
内联并排

Showing with 2 addition and 2 deletion

sound/soc/codecs/tlv320aic32x4.c sound/soc/codecs/tlv320aic32x4.c +2 -2

未找到文件。
--- a/sound/soc/codecs/tlv320aic32x4.c
+++ b/sound/soc/codecs/tlv320aic32x4.c
@@ -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);
 	}