patch-2.1.12 linux/arch/m68k/amiga/cia.c

• Lines: 27
• Date: Fri Nov 22 15:56:33 1996
• Orig file: v2.1.11/linux/arch/m68k/amiga/cia.c
• Orig date: Wed Sep 25 10:47:38 1996

diff -u --recursive --new-file v2.1.11/linux/arch/m68k/amiga/cia.c linux/arch/m68k/amiga/cia.c
@@ -55,7 +55,7 @@
 		base->icr_data &= ~mask;
 	if (base->icr_data & base->icr_mask)
 		custom.intreq = IF_SETCLR | base->int_mask;
-	return (old & base->icr_mask);
+	return old & base->icr_mask;
 }
 
 /*
@@ -77,12 +77,14 @@
 		base->icr_mask &= ~mask;
 	base->icr_mask &= CIA_ICR_ALL;
 	for (i = 0, tmp = 1; i < CIA_IRQS; i++, tmp <<= 1) {
-		if ((tmp & base->icr_mask) && !base->irq_list[i].handler)
+		if ((tmp & base->icr_mask) && !base->irq_list[i].handler) {
 			base->icr_mask &= ~tmp;
- 	}
+			base->cia->icr = tmp;
+		}
+	}
 	if (base->icr_data & base->icr_mask)
 		custom.intreq = IF_SETCLR | base->int_mask;
-	return (old);
+	return old;
 }
 
 int cia_request_irq(struct ciabase *base, unsigned int irq,