From 7595c8c4c0e55e0aff10d2739aaef0acbcefb74f Mon Sep 17 00:00:00 2001 From: Paul Mundt Date: Wed, 27 Sep 2006 16:55:24 +0900 Subject: [PATCH] --- yaml --- r: 36283 b: refs/heads/master c: 9e3043c091819729ecf4fc5063d0a2d0954dfd7f h: refs/heads/master i: 36281: 1f6872aac573291f42d9e857a51b3c8cef24d1af 36279: b57f865dd077720fc2796694f8dcf405ae819b2f v: v3 --- [refs] | 2 +- trunk/arch/sh/drivers/dma/dma-sh.c | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 82734d12d0b0..cd2549215e76 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e2d1864da5bfa419a108f42c0615f69432b1b876 +refs/heads/master: 9e3043c091819729ecf4fc5063d0a2d0954dfd7f diff --git a/trunk/arch/sh/drivers/dma/dma-sh.c b/trunk/arch/sh/drivers/dma/dma-sh.c index 4428ee809651..40a480d20aaf 100644 --- a/trunk/arch/sh/drivers/dma/dma-sh.c +++ b/trunk/arch/sh/drivers/dma/dma-sh.c @@ -82,6 +82,9 @@ static int sh_dmac_request_dma(struct dma_channel *chan) { char name[32]; + if (unlikely(!chan->flags & DMA_TEI_CAPABLE)) + return 0; + snprintf(name, sizeof(name), "DMAC Transfer End (Channel %d)", chan->chan); @@ -255,7 +258,7 @@ static int __init sh_dmac_init(void) #ifdef CONFIG_CPU_SH4 make_ipr_irq(DMAE_IRQ, DMA_IPR_ADDR, DMA_IPR_POS, DMA_PRIORITY); i = request_irq(DMAE_IRQ, dma_err, IRQF_DISABLED, "DMAC Address Error", 0); - if (i < 0) + if (unlikely(i < 0)) return i; #endif @@ -270,7 +273,7 @@ static int __init sh_dmac_init(void) * been set. */ i = dmaor_reset(); - if (i < 0) + if (unlikely(i != 0)) return i; return register_dmac(info);