3 files changed, 15 insertions, 10 deletions

diff --git a/sound/soc/s3c24xx/Kconfig b/sound/soc/s3c24xx/Kconfig
index e97c68306a9a..5632a2e1518d 100644
--- a/sound/soc/s3c24xx/Kconfig
+++ b/sound/soc/s3c24xx/Kconfig
@@ -18,7 +18,7 @@ config SND_S3C2443_SOC_AC97
         
 config SND_S3C24XX_SOC_NEO1973_WM8753
         tristate "SoC I2S Audio support for NEO1973 - WM8753"
-        depends on SND_S3C24XX_SOC && MACH_GTA01
+        depends on SND_S3C24XX_SOC && MACH_NEO1973_GTA01
         select SND_S3C24XX_SOC_I2S
         select SND_SOC_WM8753
         help
diff --git a/sound/soc/s3c24xx/s3c24xx-i2s.c b/sound/soc/s3c24xx/s3c24xx-i2s.c
index 39f02462e07d..cd89c4105fcd 100644
--- a/sound/soc/s3c24xx/s3c24xx-i2s.c
+++ b/sound/soc/s3c24xx/s3c24xx-i2s.c
@@ -385,6 +385,7 @@ static int s3c24xx_i2s_probe(struct platform_device *pdev)
         s3c24xx_i2s.iis_clk=clk_get(&pdev->dev, "iis");
         if (s3c24xx_i2s.iis_clk == NULL) {
                 DBG("failed to get iis_clock\n");
+                iounmap(s3c24xx_i2s.regs);
                 return -ENODEV;
         }
         clk_enable(s3c24xx_i2s.iis_clk);
diff --git a/sound/soc/s3c24xx/s3c24xx-pcm.c b/sound/soc/s3c24xx/s3c24xx-pcm.c
index bfbdc3cbd43b..4107a87d4de3 100644
--- a/sound/soc/s3c24xx/s3c24xx-pcm.c
+++ b/sound/soc/s3c24xx/s3c24xx-pcm.c
@@ -158,18 +158,22 @@ static int s3c24xx_pcm_hw_params(struct snd_pcm_substream *substream,
         if (!dma)
                 return 0;
 
-        /* prepare DMA */
-        prtd->params = dma;
+        /* this may get called several times by oss emulation
+         * with different params -HW */
+        if (prtd->params == NULL) {
+                /* prepare DMA */
+                prtd->params = dma;
 
-        DBG("params %p, client %p, channel %d\n", prtd->params,
-                prtd->params->client, prtd->params->channel);
+                DBG("params %p, client %p, channel %d\n", prtd->params,
+                        prtd->params->client, prtd->params->channel);
 
-        ret = s3c2410_dma_request(prtd->params->channel,
-                                  prtd->params->client, NULL);
+                ret = s3c2410_dma_request(prtd->params->channel,
+                                          prtd->params->client, NULL);
 
-        if (ret) {
-                DBG(KERN_ERR "failed to get dma channel\n");
-                return ret;
+                if (ret) {
+                        DBG(KERN_ERR "failed to get dma channel\n");
+                        return ret;
+                }
         }
 
         /* channel needs configuring for mem=>device, increment memory addr,