From c99e394a516cbe605cbacce29c375bb4c1fad009 Mon Sep 17 00:00:00 2001 From: Jassi Brar Date: Mon, 20 Dec 2010 11:05:47 +0900 Subject: [PATCH] --- yaml --- r: 230424 b: refs/heads/master c: 775bc97131c3dcf62d29cdb33e00db8f827eac35 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/sound/soc/samsung/i2s.c | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index ea3135817878..748083fcc37c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6ce534aac29ca177749000d76e4ecc8a326c852d +refs/heads/master: 775bc97131c3dcf62d29cdb33e00db8f827eac35 diff --git a/trunk/sound/soc/samsung/i2s.c b/trunk/sound/soc/samsung/i2s.c index 26b4bdf42c5b..d00ac3a7102c 100644 --- a/trunk/sound/soc/samsung/i2s.c +++ b/trunk/sound/soc/samsung/i2s.c @@ -843,11 +843,6 @@ static int i2s_trigger(struct snd_pcm_substream *substream, case SNDRV_PCM_TRIGGER_PAUSE_RELEASE: local_irq_save(flags); - if (capture) - i2s_fifo(i2s, FIC_RXFLUSH); - else - i2s_fifo(i2s, FIC_TXFLUSH); - if (config_setup(i2s)) { local_irq_restore(flags); return -EINVAL; @@ -870,6 +865,11 @@ static int i2s_trigger(struct snd_pcm_substream *substream, else i2s_txctrl(i2s, 0); + if (capture) + i2s_fifo(i2s, FIC_RXFLUSH); + else + i2s_fifo(i2s, FIC_TXFLUSH); + local_irq_restore(flags); break; }