Skip to content

Commit

Permalink
sh: Fixup TEI IRQ requests in request_dma().
Browse files Browse the repository at this point in the history
If a channel is not TEI capable, don't try to request_irq()..

Signed-off-by: Paul Mundt <lethal@linux-sh.org>
  • Loading branch information
Paul Mundt committed Sep 27, 2006
1 parent e2d1864 commit 9e3043c
Showing 1 changed file with 5 additions and 2 deletions.
7 changes: 5 additions & 2 deletions arch/sh/drivers/dma/dma-sh.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down Expand Up @@ -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

Expand All @@ -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);
Expand Down

0 comments on commit 9e3043c

Please sign in to comment.