From 047732b063b9b4c556ba578241390ad34a28d3bf Mon Sep 17 00:00:00 2001 From: Kuninori Morimoto Date: Fri, 17 Dec 2010 12:52:56 +0900 Subject: [PATCH] --- yaml --- r: 230387 b: refs/heads/master c: 9e261bbcba087b98b9d60a78e60845d5df488aa3 h: refs/heads/master i: 230385: e8c00fc179dfb11a296c54345ecb4a4c44ceef54 230383: fc4654000d3fdab4ac2193d2d6b45104fafdabed v: v3 --- [refs] | 2 +- trunk/sound/soc/sh/fsi.c | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 990f56f8bb45..58b0769f9ea3 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 97404f2e0386ac147cec00fc5d89ea475b04bd78 +refs/heads/master: 9e261bbcba087b98b9d60a78e60845d5df488aa3 diff --git a/trunk/sound/soc/sh/fsi.c b/trunk/sound/soc/sh/fsi.c index 97c5394aa7d7..9ab85936e65d 100644 --- a/trunk/sound/soc/sh/fsi.c +++ b/trunk/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);