ASoC: kirkwood: Fix erroneous double output while playing
PATCH 1/1 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"
--- sound/soc/kirkwood/kirkwood-i2s.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
sound/soc/kirkwood/kirkwood-i2s.c +5 -5
@@ -244,15 +244,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 );
Signature · 6 lines
Ken ar c'hentañ | ** Breizh ha Linux atav! ** Jef | http://moinejf.free.fr/ _______________________________________________ Alsa-devel mailing list [email protected] http://mailman.alsa-project.org/mailman/listinfo/alsa-devel
Quoted 2 lines · Jean-Francois Moine
This patch fixes the setting of the register
KIRKWOOD_PLAYCTLwhich did always streaming on both I2S and SPDIF, ignoring the DAI ID.
Applied, thanks.
Quoted 2 lines
The bug was introduced by the commit
75b9b65ee5a
"ASoC: kirkwood: add S/PDIF support"
There's the "Fixes:" tag for that now.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20131127/23ccc50d/attachment.sig>