patch-2.1.96 linux/drivers/scsi/mac53c94.c

• Lines: 42
• Date: Sat Apr 11 11:13:25 1998
• Orig file: v2.1.95/linux/drivers/scsi/mac53c94.c
• Orig date: Sat Aug 16 09:53:08 1997

diff -u --recursive --new-file v2.1.95/linux/drivers/scsi/mac53c94.c linux/drivers/scsi/mac53c94.c
@@ -19,6 +19,7 @@
 #include <asm/io.h>
 #include <asm/prom.h>
 #include <asm/system.h>
+#include <asm/spinlock.h>
 
 #include "scsi.h"
 #include "hosts.h"
@@ -57,6 +58,7 @@
 static void mac53c94_init(struct fsc_state *);
 static void mac53c94_start(struct fsc_state *);
 static void mac53c94_interrupt(int, void *, struct pt_regs *);
+static void do_mac53c94_interrupt(int, void *, struct pt_regs *);
 static void cmd_done(struct fsc_state *, int result);
 static void set_dma_cmds(struct fsc_state *, Scsi_Cmnd *);
 static int data_goes_out(Scsi_Cmnd *);
@@ -117,7 +119,7 @@
 		*prev_statep = state;
 		prev_statep = &state->next;
 
-		if (request_irq(state->intr, mac53c94_interrupt, 0,
+		if (request_irq(state->intr, do_mac53c94_interrupt, 0,
 				"53C94", state)) {
 			printk(KERN_ERR "mac53C94: can't get irq %d\n", state->intr);
 		}
@@ -268,6 +270,16 @@
 
 	if (cmd->use_sg > 0 || cmd->request_bufflen != 0)
 		set_dma_cmds(state, cmd);
+}
+
+static void
+do_mac53c94_interrupt(int irq, void *dev_id, struct pt_regs *ptregs)
+{
+	unsigned long flags;
+
+	spin_lock_irqsave(&io_request_lock, flags);
+	mac53c94_interrupt(irq, dev_id, ptregs);
+	spin_unlock_irqrestore(&io_request_lock, flags);
 }
 
 static void