Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-12-15 15:41:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

ASoC: sh: fsi: move fsi_irq_enable function to fsi_dai_trigger

Browse Source 
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>
This commit is contained in:
Kuninori Morimoto 2010-12-17 12:52:56 +09:00 committed by Mark Brown
parent 97404f2e03
commit 9e261bbcba
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sound/soc/sh/fsi.c
View File

@ -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, DOFF_ST, 0) :
fsi_reg_write(fsi, DIFF_ST, 0); fsi_reg_write(fsi, DIFF_ST, 0);
/* re-enable irq */
fsi_irq_enable(fsi, is_play);
if (over_period) if (over_period)
snd_pcm_period_elapsed(substream); 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->buffer_size),
frames_to_bytes(runtime, runtime->period_size)); frames_to_bytes(runtime, runtime->period_size));
ret = is_play ? fsi_data_push(fsi, 1) : fsi_data_pop(fsi, 1); ret = is_play ? fsi_data_push(fsi, 1) : fsi_data_pop(fsi, 1);
fsi_irq_enable(fsi, is_play);
break; break;
case SNDRV_PCM_TRIGGER_STOP: case SNDRV_PCM_TRIGGER_STOP:
fsi_irq_disable(fsi, is_play); fsi_irq_disable(fsi, is_play);