[ALSA] Remove sound/driver.h

[pandora-kernel.git] / sound / soc / s3c24xx / s3c24xx-pcm.c

diff --git a/sound/soc/s3c24xx/s3c24xx-pcm.c b/sound/soc/s3c24xx/s3c24xx-pcm.c
index bfbdc3c..290dcf1 100644 (file)
--- a/sound/soc/s3c24xx/s3c24xx-pcm.c
+++ b/sound/soc/s3c24xx/s3c24xx-pcm.c
@@ -24,7 +24,6 @@
 #include <linux/slab.h>
 #include <linux/dma-mapping.h>
 
-#include <sound/driver.h>
 #include <sound/core.h>
 #include <sound/pcm.h>
 #include <sound/pcm_params.h>
@@ -158,18 +157,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,