patch-2.1.62 linux/drivers/isdn/hisax/ix1_micro.c

Next file: linux/drivers/isdn/hisax/teles0.c
Previous file: linux/drivers/isdn/hisax/isdnl1.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.1.61/linux/drivers/isdn/hisax/ix1_micro.c linux/drivers/isdn/hisax/ix1_micro.c
@@ -644,7 +644,7 @@
 	struct IsdnCardState *sp;
 	u_char val, stat = 0;
 
-	sp = (struct IsdnCardState *) irq2dev_map[intno];
+	sp = (struct IsdnCardState *) dev_id;
 
 	if (!sp) {
 		printk(KERN_WARNING "Teles: Spurious interrupt!\n");
@@ -867,8 +867,7 @@
 			printk(KERN_WARNING
 			       "ix1-Micro: IRQ(%d) getting no interrupts during init\n",
 			       sp->irq);
-			irq2dev_map[sp->irq] = NULL;
-			free_irq(sp->irq, NULL);
+			free_irq(sp->irq, sp);
 			return (0);
 		}
 	}

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen, slshen@lbl.gov