diff options
author | Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> | 2010-12-17 04:52:56 +0100 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-12-17 13:56:59 +0100 |
commit | 9e261bbcba087b98b9d60a78e60845d5df488aa3 (patch) | |
tree | 05999ee8c0371b8414de88df398518c46eec2188 /sound/soc/sh | |
parent | ASoC: Do DAPM control updates in the middle of DAPM sequences (diff) | |
download | linux-9e261bbcba087b98b9d60a78e60845d5df488aa3.tar.xz linux-9e261bbcba087b98b9d60a78e60845d5df488aa3.zip |
ASoC: sh: fsi: move fsi_irq_enable function to fsi_dai_trigger
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'sound/soc/sh')
-rw-r--r-- | sound/soc/sh/fsi.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/sound/soc/sh/fsi.c b/sound/soc/sh/fsi.c index 97c5394aa7d7..9ab85936e65d 100644 --- a/sound/soc/sh/fsi.c +++ b/sound/soc/sh/fsi.c @@ -684,9 +684,6 @@ static int fsi_fifo_data_ctrl(struct fsi_priv *fsi, int startup, int stream) fsi_reg_write(fsi, DOFF_ST, 0) : fsi_reg_write(fsi, DIFF_ST, 0); - /* re-enable irq */ - fsi_irq_enable(fsi, is_play); - if (over_period) snd_pcm_period_elapsed(substream); @@ -859,6 +856,7 @@ static int fsi_dai_trigger(struct snd_pcm_substream *substream, int cmd, frames_to_bytes(runtime, runtime->buffer_size), frames_to_bytes(runtime, runtime->period_size)); ret = is_play ? fsi_data_push(fsi, 1) : fsi_data_pop(fsi, 1); + fsi_irq_enable(fsi, is_play); break; case SNDRV_PCM_TRIGGER_STOP: fsi_irq_disable(fsi, is_play); |