diff options
| author |   Russell King <rmk+kernel@arm.linux.org.uk> | 2014-06-26 15:23:00 +0100 |
|---|---|---|
| committer |   Mark Brown <broonie@linaro.org> | 2014-06-28 13:18:22 +0100 |
| commit | 6772190632ebce6c5c6010d2bc77d5de866831b6 (patch) | |
| tree | b88718302fa237e688b90a973a9369d53eaf8aed /sound/soc/kirkwood/kirkwood-i2s.c | |
| parent | ASoC: kirkwood-i2s: provide helper KIRKWOOD_RECCTL_ENABLE_MASK definition (diff) | |
| download | wireguard-linux-6772190632ebce6c5c6010d2bc77d5de866831b6.tar.xz wireguard-linux-6772190632ebce6c5c6010d2bc77d5de866831b6.zip | |
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>
Diffstat (limited to 'sound/soc/kirkwood/kirkwood-i2s.c')
| -rw-r--r-- | sound/soc/kirkwood/kirkwood-i2s.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sound/soc/kirkwood/kirkwood-i2s.c b/sound/soc/kirkwood/kirkwood-i2s.c index 55af6c8e4603..ef1a164d8703 100644 --- a/sound/soc/kirkwood/kirkwood-i2s.c +++ b/sound/soc/kirkwood/kirkwood-i2s.c @@ -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; } |