From 991caaf0379adb82413c70f00dc0c046eff0836a Mon Sep 17 00:00:00 2001 From: Noe Rubinstein Date: Fri, 3 Dec 2010 21:45:57 +0100 Subject: fix further span/port confusion --- xhfc/xhfc.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/xhfc/xhfc.c b/xhfc/xhfc.c index a0d61f1..3f62d60 100644 --- a/xhfc/xhfc.c +++ b/xhfc/xhfc.c @@ -571,13 +571,13 @@ irqreturn_t xhfc_interrupt(int irq, void *dev_id, struct pt_regs* ptregs) if (misc_irq & M_TI_IRQMSK) xhfc->ticks++; - /* - for(i = 0; i < SPANS_PER_CHIP; i++) - fifo_irq |= (read_xhfc(xhfc, R_FIFO_BL0_IRQ + i) | - read_xhfc(xhfc, R_FILL_BL0 + i)) << (i * 8); + for(i = SPANS_PER_CHIP; i; i--) { + fifo_irq |= read_xhfc(xhfc, R_FIFO_BL0_IRQ + i); + fifo_irq |= read_xhfc(xhfc, R_FILL_BL0 + i) + fifo_irq << 8; + } if(DBG_HDLC && fifo_irq) printk(KERN_INFO DRIVER_NAME ": fifo_irq=0x%08x\n", fifo_irq); - */ for (i = 0; i < SPANS_PER_CHIP; i++) { @@ -911,7 +911,7 @@ void init_spans(struct xhfc* x) DAHDI_CONFIG_AMI | DAHDI_CONFIG_CCS ; sprintf(dahdi_span->name, "XHFC/%d", i+1); - sprintf(dahdi_span->desc, "XHFC Span %d", i+1); + sprintf(dahdi_span->desc, "XHFC port %d", i+1); dahdi_span->manufacturer = "Avencall"; dahdi_copy_string(dahdi_span->devicetype, "XHFC-4SU", sizeof(dahdi_span->devicetype)); -- cgit v1.2.3