Merge branch 'for-3.1' into for-3.2

This commit is contained in:
Mark Brown 2011-10-06 20:03:18 +01:00
Родитель ac60155f7a 23524eb16a
Коммит 4f6d45f121
1 изменённых файлов: 2 добавлений и 2 удалений

Просмотреть файл

@ -685,10 +685,10 @@ static int aic32x4_probe(struct snd_soc_codec *codec)
} }
/* Mic PGA routing */ /* 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); 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); snd_soc_write(codec, AIC32X4_RMICPGANIN, AIC32X4_RMICPGANIN_IN1L_10K);
} }