From 4b2a7709969c8d5e3f8ec0927b63aff0632a33aa Mon Sep 17 00:00:00 2001
From: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Tue, 13 Jul 2010 12:29:10 +0100
Subject: [PATCH] --- yaml --- r: 206591 b: refs/heads/master c:
 4d53952a396d7fcde295b6eedee1f588dfb8464c h: refs/heads/master i:   206589:
 7af1af3d0e1881d104b54b4d6fb6c2c0eb001c7b   206587:
 2b346c2ef1bb14e534bf9877b43a706e0a517965   206583:
 a0f4f31f9ca7aff502d935c3d99f6b5f60795e97   206575:
 edeaf62a59b10500e7b53db4a90b7d20ef2ff69c   206559:
 2a01e7341ad7c55ff465d91e30f9524d4b9b5522   206527:
 96a08ff29cfb02f1a34ed6bc93c9669ebf1b0a7a   206463:
 f6fd6bf6ac5d96b04d1d802403d15dbeed236ad0   206335:
 441ebf90dfa055e850fa28d0f59d494ae0757d22 v: v3

---
 [refs]                   |  2 +-
 trunk/sound/soc/sh/fsi.c | 27 +++++++++++----------------
 2 files changed, 12 insertions(+), 17 deletions(-)

diff --git a/[refs] b/[refs]
index a2cd4d1f016f..bb2bfb5fc5fa 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 66b47fdb851924956b6e4696fb43a3496ae2c462
+refs/heads/master: 4d53952a396d7fcde295b6eedee1f588dfb8464c
diff --git a/trunk/sound/soc/sh/fsi.c b/trunk/sound/soc/sh/fsi.c
index 30765ab512f6..b1cd859723c0 100644
--- a/trunk/sound/soc/sh/fsi.c
+++ b/trunk/sound/soc/sh/fsi.c
@@ -674,20 +674,15 @@ static int fsi_dai_startup(struct snd_pcm_substream *substream,
 
 	/* clock inversion (CKG2) */
 	data = 0;
-	switch (SH_FSI_INVERSION_MASK & flags) {
-	case SH_FSI_LRM_INV:
-		data = 1 << 12;
-		break;
-	case SH_FSI_BRM_INV:
-		data = 1 << 8;
-		break;
-	case SH_FSI_LRS_INV:
-		data = 1 << 4;
-		break;
-	case SH_FSI_BRS_INV:
-		data = 1 << 0;
-		break;
-	}
+	if (SH_FSI_LRM_INV & flags)
+		data |= 1 << 12;
+	if (SH_FSI_BRM_INV & flags)
+		data |= 1 << 8;
+	if (SH_FSI_LRS_INV & flags)
+		data |= 1 << 4;
+	if (SH_FSI_BRS_INV & flags)
+		data |= 1 << 0;
+
 	fsi_reg_write(fsi, CKG2, data);
 
 	/* do fmt, di fmt */
@@ -717,15 +712,15 @@ static int fsi_dai_startup(struct snd_pcm_substream *substream,
 		break;
 	case SH_FSI_FMT_TDM:
 		msg = "TDM";
-		data = CR_FMT(CR_TDM) | (fsi->chan - 1);
 		fsi->chan = is_play ?
 			SH_FSI_GET_CH_O(flags) : SH_FSI_GET_CH_I(flags);
+		data = CR_FMT(CR_TDM) | (fsi->chan - 1);
 		break;
 	case SH_FSI_FMT_TDM_DELAY:
 		msg = "TDM Delay";
-		data = CR_FMT(CR_TDM_D) | (fsi->chan - 1);
 		fsi->chan = is_play ?
 			SH_FSI_GET_CH_O(flags) : SH_FSI_GET_CH_I(flags);
+		data = CR_FMT(CR_TDM_D) | (fsi->chan - 1);
 		break;
 	default:
 		dev_err(dai->dev, "unknown format.\n");