2 files changed, 3 insertions, 1 deletions

diff --git a/sound/soc/s3c24xx/s3c24xx-i2s.c b/sound/soc/s3c24xx/s3c24xx-i2s.c
index 4ebcd6a8bf28..1ed6afd45459 100644
--- a/sound/soc/s3c24xx/s3c24xx-i2s.c
+++ b/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;
diff --git a/sound/soc/s3c24xx/s3c24xx-pcm.c b/sound/soc/s3c24xx/s3c24xx-pcm.c
index 6c70a81c730c..7806ae614617 100644
--- a/sound/soc/s3c24xx/s3c24xx-pcm.c
+++ b/sound/soc/s3c24xx/s3c24xx-pcm.c
@@ -171,7 +171,7 @@ static int s3c24xx_pcm_hw_params(struct snd_pcm_substream *substream,
                 ret = s3c2410_dma_request(prtd->params->channel,
                                           prtd->params->client, NULL);
 
-                if (ret) {
+                if (ret < 0) {
                         DBG(KERN_ERR "failed to get dma channel\n");
                         return ret;
                 }