Merge git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-fixes

[karo-tx-linux.git] / drivers / dma / shdma.c

diff --git a/drivers/dma/shdma.c b/drivers/dma/shdma.c
index 727e76ff13e17ecbcabbb286f981bda820bb137e..2a638f9f09a25d5ed37411d7a997172b928491ce 100644 (file)
--- a/drivers/dma/shdma.c
+++ b/drivers/dma/shdma.c
@@ -343,7 +343,7 @@ static int sh_dmae_alloc_chan_resources(struct dma_chan *chan)
 
                dmae_set_dmars(sh_chan, cfg->mid_rid);
                dmae_set_chcr(sh_chan, cfg->chcr);
-       } else if ((sh_dmae_readl(sh_chan, CHCR) & 0xf00) != 0x400) {
+       } else {
                dmae_init(sh_chan);
        }