Merge branch 'next' of git://git.infradead.org/users/vkoul/slave-dma

[pandora-kernel.git] / sound / soc / samsung / ac97.c

diff --git a/sound/soc/samsung/ac97.c b/sound/soc/samsung/ac97.c
index 65ea538..bad91b4 100644 (file)
--- a/sound/soc/samsung/ac97.c
+++ b/sound/soc/samsung/ac97.c
@@ -271,7 +271,10 @@ static int s3c_ac97_trigger(struct snd_pcm_substream *substream, int cmd,
 
        writel(ac_glbctrl, s3c_ac97.regs + S3C_AC97_GLBCTRL);
 
 
        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;
 }
 
        return 0;
 }


@@ -317,7 +320,10 @@ static int s3c_ac97_mic_trigger(struct snd_pcm_substream *substream,
 
        writel(ac_glbctrl, s3c_ac97.regs + S3C_AC97_GLBCTRL);
 
 
        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;
 }
 
        return 0;
 }


@@ -444,7 +450,7 @@ static __devinit int s3c_ac97_probe(struct platform_device *pdev)
        }
 
        ret = request_irq(irq_res->start, s3c_ac97_irq,
        }
 
        ret = request_irq(irq_res->start, s3c_ac97_irq,

-                                       IRQF_DISABLED, "AC97", NULL);
+                                       0, "AC97", NULL);

        if (ret < 0) {
                dev_err(&pdev->dev, "ac97: interrupt request failed.\n");
                goto err4;
        if (ret < 0) {
                dev_err(&pdev->dev, "ac97: interrupt request failed.\n");
                goto err4;