From 2137c78fbca59f42cc834af033be3270b4161646 Mon Sep 17 00:00:00 2001
From: Davide Rizzo <davide@elpa.it>
Date: Mon, 5 May 2008 14:59:39 +0200
Subject: [PATCH] --- yaml --- r: 96006 b: refs/heads/master c:
 2c36eecfb6471c457994647771d1405502ad5fde h: refs/heads/master v: v3

---
 [refs]                                | 2 +-
 trunk/sound/soc/s3c24xx/s3c24xx-i2s.c | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index febe9a40dd15..ef697df6b516 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d6426171bab3403cdcd5613d5549f20b0ab0967c
+refs/heads/master: 2c36eecfb6471c457994647771d1405502ad5fde
diff --git a/trunk/sound/soc/s3c24xx/s3c24xx-i2s.c b/trunk/sound/soc/s3c24xx/s3c24xx-i2s.c
index 4ebcd6a8bf28..1ed6afd45459 100644
--- a/trunk/sound/soc/s3c24xx/s3c24xx-i2s.c
+++ b/trunk/sound/soc/s3c24xx/s3c24xx-i2s.c
@@ -224,6 +224,7 @@ static int s3c24xx_i2s_set_fmt(struct snd_soc_cpu_dai *cpu_dai,
 		iismod |= S3C2410_IISMOD_SLAVE;
 		break;
 	case SND_SOC_DAIFMT_CBS_CFS:
+		iismod &= ~S3C2410_IISMOD_SLAVE;
 		break;
 	default:
 		return -EINVAL;
@@ -234,6 +235,7 @@ static int s3c24xx_i2s_set_fmt(struct snd_soc_cpu_dai *cpu_dai,
 		iismod |= S3C2410_IISMOD_MSB;
 		break;
 	case SND_SOC_DAIFMT_I2S:
+		iismod &= ~S3C2410_IISMOD_MSB;
 		break;
 	default:
 		return -EINVAL;