patch-pre2.0.7 linux/arch/m68k/atari/ataints.c

Next file: linux/arch/m68k/atari/atakeyb.c
Previous file: linux/arch/m68k/atari/atafb.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file pre2.0.6/linux/arch/m68k/atari/ataints.c linux/arch/m68k/atari/ataints.c
@@ -25,7 +25,7 @@
  *  below.
  *
  * This file is subject to the terms and conditions of the GNU General Public
- * License.  See the file README.legal in the main directory of this archive
+ * License.  See the file COPYING in the main directory of this archive
  * for more details.
  *
  */
@@ -511,7 +511,7 @@
 }
 
 
-int atari_remove_isr(unsigned long source, isrfunc isr)
+int atari_remove_isr(unsigned long source, isrfunc isr, void *data)
 {
 	unsigned long flags;
 	int vector;
@@ -533,7 +533,8 @@
 
 	if (irq_handler[source].isr != atari_call_isr_list) {
 		/* It's the only handler for the interrupt */
-		if (irq_handler[source].isr != isr) {
+		if (irq_handler[source].isr != isr &&
+		    irq_handler[source].data != data) {
 			restore_flags(flags);
 			goto not_found;
 		}

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen, slshen@lbl.gov with Sam's (original) version
of this