---

yaml --- r: 293427 b: refs/heads/master c: c90887f h: refs/heads/master i: 293425: 87423ab 293423: 4d7d336 v: v3
git-mirror · Feb 29, 2012 · ebe0958 · ebe0958
1 parent 1796f9e
commit ebe0958
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 7 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 62172f4a750e28c5573b3402c3fe3f029b5dd67b
+refs/heads/master: c90887fe982e46d1b23e151636616d4e4a0077a4
diff --git a/trunk/sound/soc/samsung/i2s.c b/trunk/sound/soc/samsung/i2s.c
@@ -761,15 +761,13 @@ static int i2s_trigger(struct snd_pcm_substream *substream,
 	case SNDRV_PCM_TRIGGER_PAUSE_PUSH:
 		local_irq_save(flags);
 
-		if (capture)
+		if (capture) {
 			i2s_rxctrl(i2s, 0);
-		else
-			i2s_txctrl(i2s, 0);
-
-		if (capture)
 			i2s_fifo(i2s, FIC_RXFLUSH);
-		else
+		} else {
+			i2s_txctrl(i2s, 0);
 			i2s_fifo(i2s, FIC_TXFLUSH);
+		}
 
 		local_irq_restore(flags);
 		break;