diff options
| author |   Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-10-06 20:03:18 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-10-06 20:03:18 +0100 |
| commit | 4f6d45f121ba190f87c67503a73d8ff2ffa3e946 (patch) | |
| tree | 8ecfa71f45db3d6d169429ac9d2cfd95e51acb3e | |
| parent | ASoC: Return early with -EINVAL if invalid dai format is detected (diff) | |
| parent | ASoC: tlv320aic32x4 fix initialization of micpga routing (diff) | |
Merge branch 'for-3.1' into for-3.2
| -rw-r--r-- | sound/soc/codecs/tlv320aic32x4.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/soc/codecs/tlv320aic32x4.c b/sound/soc/codecs/tlv320aic32x4.c index e93b9d1ae1dd..a68982e0a1ae 100644 --- 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); } |