From ad0ed684c782e905dfe73c079619cac4a634e236 Mon Sep 17 00:00:00 2001
From: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Mon, 11 Jan 2010 16:56:19 +0000
Subject: [PATCH] --- yaml --- r: 182828 b: refs/heads/master c:
 d08a68bfca5a6464eb9167be0659bf0676f02555 h: refs/heads/master v: v3

---
 [refs]                        |  2 +-
 trunk/sound/soc/imx/imx-ssi.c | 12 ++++--------
 2 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/[refs] b/[refs]
index 0aa59a80bea5..f0052b258c22 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 48dbc41988d07c7a9ba83afd31543d8ecb2beecc
+refs/heads/master: d08a68bfca5a6464eb9167be0659bf0676f02555
diff --git a/trunk/sound/soc/imx/imx-ssi.c b/trunk/sound/soc/imx/imx-ssi.c
index ccb7ec9ce997..56f46a75d297 100644
--- a/trunk/sound/soc/imx/imx-ssi.c
+++ b/trunk/sound/soc/imx/imx-ssi.c
@@ -133,15 +133,11 @@ static int imx_ssi_set_dai_fmt(struct snd_soc_dai *cpu_dai, unsigned int fmt)
 
 	/* DAI clock master masks */
 	switch (fmt & SND_SOC_DAIFMT_MASTER_MASK) {
-	case SND_SOC_DAIFMT_CBS_CFS:
-		strcr |= SSI_STCR_TFDIR | SSI_STCR_TXDIR;
-		break;
-	case SND_SOC_DAIFMT_CBM_CFS:
-		strcr |= SSI_STCR_TFDIR;
-		break;
-	case SND_SOC_DAIFMT_CBS_CFM:
-		strcr |= SSI_STCR_TXDIR;
+	case SND_SOC_DAIFMT_CBM_CFM:
 		break;
+	default:
+		/* Master mode not implemented, needs handling of clocks. */
+		return -EINVAL;
 	}
 
 	strcr |= SSI_STCR_TFEN0;