---

yaml --- r: 182828 b: refs/heads/master c: d08a68b h: refs/heads/master v: v3
git-mirror · Jan 17, 2010 · ad0ed68 · ad0ed68
1 parent 72db078
commit ad0ed68
Show file tree

Hide file tree

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