From ebe09581f9244a46d9ab24fdf30782de14600f8b Mon Sep 17 00:00:00 2001
From: Jassi Brar <jaswinder.singh@linaro.org>
Date: Sat, 25 Feb 2012 16:42:34 +0530
Subject: [PATCH] --- yaml --- r: 293427 b: refs/heads/master c:
 c90887fe982e46d1b23e151636616d4e4a0077a4 h: refs/heads/master i:   293425:
 87423ab6834ce9b7284a81dec7b98fbc224d62d0   293423:
 4d7d336b8625ddb25a24ecefd10dbde922312c4e v: v3

---
 [refs]                        |  2 +-
 trunk/sound/soc/samsung/i2s.c | 10 ++++------
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index 56855533cb13..617940cbcc40 100644
--- 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
index 87a874dc7a35..ea5ccaec83fc 100644
--- 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;