diff --git a/[refs] b/[refs] index 9226905feeed..e1051c014f86 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1222de7c415cfa70f441f836588fd79a3334d4fe +refs/heads/master: a1b2cc50679c1d2eed44e2885f6178ce907498b7 diff --git a/trunk/drivers/dma/shdma.c b/trunk/drivers/dma/shdma.c index 727e76ff13e1..2a638f9f09a2 100644 --- a/trunk/drivers/dma/shdma.c +++ b/trunk/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); }