summaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorChristoph Huber <c.huber@bct-electronic.com>2016-08-15 18:59:25 +0200
committerMark Brown <broonie@kernel.org>2016-08-16 12:29:10 +0100
commit3e103a65514c2947e53f3171b21255fbde8b60c6 (patch)
tree0afef7cc4699984b3da806c147a35c299f1a3e8b /sound
parent29b4817d4018df78086157ea3a55c1d9424a7cfc (diff)
downloadlinux-stable-3e103a65514c2947e53f3171b21255fbde8b60c6.tar.gz
linux-stable-3e103a65514c2947e53f3171b21255fbde8b60c6.tar.bz2
linux-stable-3e103a65514c2947e53f3171b21255fbde8b60c6.zip
ASoC: atmel_ssc_dai: Don't unconditionally reset SSC on stream startup
commit cbaadf0f90d6 ("ASoC: atmel_ssc_dai: refactor the startup and shutdown") refactored code such that the SSC is reset on every startup; this breaks duplex audio (e.g. first start audio playback, then start record, causing the playback to stop/hang) Fixes: cbaadf0f90d6 (ASoC: atmel_ssc_dai: refactor the startup and shutdown) Signed-off-by: Christoph Huber <c.huber@bct-electronic.com> Signed-off-by: Peter Meerwald-Stadler <p.meerwald@bct-electronic.com> Signed-off-by: Mark Brown <broonie@kernel.org> Cc: stable@vger.kernel.org
Diffstat (limited to 'sound')
-rw-r--r--sound/soc/atmel/atmel_ssc_dai.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/sound/soc/atmel/atmel_ssc_dai.c b/sound/soc/atmel/atmel_ssc_dai.c
index 54c09acd3fed..16e459aedffe 100644
--- a/sound/soc/atmel/atmel_ssc_dai.c
+++ b/sound/soc/atmel/atmel_ssc_dai.c
@@ -299,8 +299,9 @@ static int atmel_ssc_startup(struct snd_pcm_substream *substream,
clk_enable(ssc_p->ssc->clk);
ssc_p->mck_rate = clk_get_rate(ssc_p->ssc->clk);
- /* Reset the SSC to keep it at a clean status */
- ssc_writel(ssc_p->ssc->regs, CR, SSC_BIT(CR_SWRST));
+ /* Reset the SSC unless initialized to keep it in a clean state */
+ if (!ssc_p->initialized)
+ ssc_writel(ssc_p->ssc->regs, CR, SSC_BIT(CR_SWRST));
if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) {
dir = 0;