Merge branch 'modsplit-Oct31_2011' of git://git.kernel.org/pub/scm/linux/kernel/git...

[~andy/linux] / sound / soc / samsung / ac97.c

diff --git a/sound/soc/samsung/ac97.c b/sound/soc/samsung/ac97.c
index b5e922f469d5a0a70b9c477aa231b6b278b2eb60..16521e3ffc0c5af67712c1cdc1cd3c00e4ad501a 100644 (file)
--- a/sound/soc/samsung/ac97.c
+++ b/sound/soc/samsung/ac97.c
@@ -15,6 +15,7 @@
 #include <linux/io.h>
 #include <linux/delay.h>
 #include <linux/clk.h>
+#include <linux/module.h>
 
 #include <sound/soc.h>
 
@@ -271,7 +272,10 @@ static int s3c_ac97_trigger(struct snd_pcm_substream *substream, int cmd,
 
        writel(ac_glbctrl, s3c_ac97.regs + S3C_AC97_GLBCTRL);
 
-       s3c2410_dma_ctrl(dma_data->channel, S3C2410_DMAOP_STARTED);
+       if (!dma_data->ops)
+               dma_data->ops = samsung_dma_get_ops();
+
+       dma_data->ops->started(dma_data->channel);
 
        return 0;
 }
@@ -317,7 +321,10 @@ static int s3c_ac97_mic_trigger(struct snd_pcm_substream *substream,
 
        writel(ac_glbctrl, s3c_ac97.regs + S3C_AC97_GLBCTRL);
 
-       s3c2410_dma_ctrl(dma_data->channel, S3C2410_DMAOP_STARTED);
+       if (!dma_data->ops)
+               dma_data->ops = samsung_dma_get_ops();
+
+       dma_data->ops->started(dma_data->channel);
 
        return 0;
 }