[alsa-devel] [PATCH] soc: codecs: tlv320aic32x4: fix initialization of micpga routing
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 --- 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 e93b9d1..a68982e 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); }
On Thu, Oct 06, 2011 at 08:53:36PM +0200, Wolfram Sang wrote:
Checking the pdata-flags used 'or', so the check is always true. Use 'and' to correctly mask the flags.
Applied, thanks. Please try to choose subjects which resemble those for the rest of the subsystem.
participants (2)
-
Mark Brown
-
Wolfram Sang