---

yaml --- r: 230387 b: refs/heads/master c: 9e261bb h: refs/heads/master i: 230385: e8c00fc 230383: fc46540 v: v3
git-mirror · Dec 17, 2010 · 047732b · 047732b
1 parent 107e0b4
commit 047732b
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git 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
@@ -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);