Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/livep...

[linux-2.6-microblaze.git] / drivers / dma / coh901318.c

diff --git a/drivers/dma/coh901318.c b/drivers/dma/coh901318.c
index eebaba3..b69d66e 100644 (file)
--- a/drivers/dma/coh901318.c
+++ b/drivers/dma/coh901318.c
@@ -1802,13 +1802,10 @@ static struct dma_chan *coh901318_xlate(struct of_phandle_args *dma_spec,
 static int coh901318_config(struct coh901318_chan *cohc,
                            struct coh901318_params *param)
 {
-       unsigned long flags;
        const struct coh901318_params *p;
        int channel = cohc->id;
        void __iomem *virtbase = cohc->base->virtbase;
 
-       spin_lock_irqsave(&cohc->lock, flags);
-
        if (param)
                p = param;
        else
@@ -1828,8 +1825,6 @@ static int coh901318_config(struct coh901318_chan *cohc,
        coh901318_set_conf(cohc, p->config);
        coh901318_set_ctrl(cohc, p->ctrl_lli_last);
 
-       spin_unlock_irqrestore(&cohc->lock, flags);
-
        return 0;
 }