diff options
| author | Jean-Francois Moine <moinejf@free.fr> | 2013-11-25 20:19:05 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-11-27 17:16:21 +0000 |
| commit | 4f6f1478c1ada4524e9ed21190b4549233a816a3 (patch) | |
| tree | 3c8c0f797758f99135174a35dd71583939dd98af /sound/soc | |
| parent | 1c195ddb1de14ff9a6327c47f88428200f7c8d88 (diff) | |
| download | op-kernel-dev-4f6f1478c1ada4524e9ed21190b4549233a816a3.zip op-kernel-dev-4f6f1478c1ada4524e9ed21190b4549233a816a3.tar.gz | |
ASoC: kirkwood: Fix erroneous double output while playing
This patch fixes the setting of the register KIRKWOOD_PLAYCTL which did
always streaming on both I2S and SPDIF, ignoring the DAI ID.
The bug was introduced by the commit 75b9b65ee5a
"ASoC: kirkwood: add S/PDIF support"
Signed-off-by: Jean-Francois Moine <moinejf@free.fr>
Signed-off-by: Mark Brown <broonie@linaro.org>
Diffstat (limited to 'sound/soc')
| -rw-r--r-- | sound/soc/kirkwood/kirkwood-i2s.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sound/soc/kirkwood/kirkwood-i2s.c b/sound/soc/kirkwood/kirkwood-i2s.c index b42492d..0b18f65 100644 --- a/sound/soc/kirkwood/kirkwood-i2s.c +++ b/sound/soc/kirkwood/kirkwood-i2s.c @@ -248,15 +248,15 @@ static int kirkwood_i2s_play_trigger(struct snd_pcm_substream *substream, ctl); } - if (dai->id == 0) - ctl &= ~KIRKWOOD_PLAYCTL_SPDIF_EN; /* i2s */ - else - ctl &= ~KIRKWOOD_PLAYCTL_I2S_EN; /* spdif */ - switch (cmd) { case SNDRV_PCM_TRIGGER_START: /* configure */ ctl = priv->ctl_play; + if (dai->id == 0) + ctl &= ~KIRKWOOD_PLAYCTL_SPDIF_EN; /* i2s */ + else + ctl &= ~KIRKWOOD_PLAYCTL_I2S_EN; /* spdif */ + value = ctl & ~KIRKWOOD_PLAYCTL_ENABLE_MASK; writel(value, priv->io + KIRKWOOD_PLAYCTL); |
