[src/trunk]: src/sys/arch/arm/allwinner when enabling IRQ, compare channel ty...

[jmcneill <jmcneill%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/524236d19839
branches:  trunk
changeset: 333269:524236d19839
user:      jmcneill <jmcneill%NetBSD.org@localhost>
date:      Sun Oct 26 15:07:33 2014 +0000

description:
when enabling IRQ, compare channel type to the channel type, not the type (string) passed in from the caller -- unbreaks A10/A20 audio after awindma split

diffstat:

 sys/arch/arm/allwinner/awin_dma_a10.c |  6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diffs (27 lines):

diff -r c186899d8b8a -r 524236d19839 sys/arch/arm/allwinner/awin_dma_a10.c
--- a/sys/arch/arm/allwinner/awin_dma_a10.c     Sun Oct 26 14:19:28 2014 +0000
+++ b/sys/arch/arm/allwinner/awin_dma_a10.c     Sun Oct 26 15:07:33 2014 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: awin_dma_a10.c,v 1.1 2014/10/13 12:34:00 jmcneill Exp $ */
+/* $NetBSD: awin_dma_a10.c,v 1.2 2014/10/26 15:07:33 jmcneill Exp $ */
 
 /*-
  * Copyright (c) 2014 Jared D. McNeill <jmcneill%invisible.ca@localhost>
@@ -29,7 +29,7 @@
 #include "opt_ddb.h"
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: awin_dma_a10.c,v 1.1 2014/10/13 12:34:00 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: awin_dma_a10.c,v 1.2 2014/10/26 15:07:33 jmcneill Exp $");
 
 #include <sys/param.h>
 #include <sys/bus.h>
@@ -195,7 +195,7 @@
                        ch->ch_callbackarg = cbarg;
 
                        irqen = DMA_READ(sc, AWIN_DMA_IRQ_EN_REG);
-                       if (type == CH_NDMA)
+                       if (ch->ch_type == CH_NDMA)
                                irqen |= AWIN_DMA_IRQ_NDMA_END(index);
                        else
                                irqen |= AWIN_DMA_IRQ_DDMA_END(index);