Commit 67721906 authored Jun 26, 2014 by Russell King Committed by Mark Brown Jun 28, 2014

ASoC: kirkwood-i2s: fix RECCTL masking



Since we wish to disable capture inputs for some formats, we need to
ensure that we clear the enable bits in our cached record control
register.  This seems to have been missed, resulting in the register
only accumulating enable bits.

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Tested-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: Mark Brown <broonie@linaro.org>

parent 52b896cf

sound/soc/kirkwood/kirkwood-i2s.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -212,7 +212,8 @@ static int kirkwood_i2s_hw_params(struct snd_pcm_substream *substream,
		KIRKWOOD_PLAYCTL_SIZE_MASK);
		priv->ctl_play \|= ctl_play;
		} else {
		priv->ctl_rec &= ~KIRKWOOD_RECCTL_SIZE_MASK;
		priv->ctl_rec &= ~(KIRKWOOD_RECCTL_ENABLE_MASK \|
		KIRKWOOD_RECCTL_SIZE_MASK);
		priv->ctl_rec \|= ctl_rec;
		}