diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 1998-05-07 02:55:41 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 1998-05-07 02:55:41 +0000 |
| commit | dcec8a13bf565e47942a1751a9cec21bec5648fe (patch) | |
| tree | 548b69625b18cc2e88c3e68d0923be546c9ebb03 /drivers/scsi/a3000.c | |
| parent | 2e0f55e79c49509b7ff70ff1a10e1e9e90a3dfd4 (diff) | |
o Merge with Linux 2.1.99.
o Fix ancient bug in the ELF loader making ldd crash.
o Fix ancient bug in the keyboard code for SGI, SNI and Jazz.
Diffstat (limited to 'drivers/scsi/a3000.c')
| -rw-r--r-- | drivers/scsi/a3000.c | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/drivers/scsi/a3000.c b/drivers/scsi/a3000.c index fdc7fd41d..099d33704 100644 --- a/drivers/scsi/a3000.c +++ b/drivers/scsi/a3000.c @@ -11,6 +11,7 @@ #include <asm/amigaints.h> #include <asm/amigahw.h> #include <asm/irq.h> +#include <asm/spinlock.h> #include "scsi.h" #include "hosts.h" @@ -35,7 +36,6 @@ static void a3000_intr (int irq, void *dummy, struct pt_regs *fp) if (!(status & ISTR_INT_P)) return; - if (status & ISTR_INTS) { /* disable PORTS interrupt */ @@ -48,6 +48,14 @@ static void a3000_intr (int irq, void *dummy, struct pt_regs *fp) } } +static void do_a3000_intr (int irq, void *dummy, struct pt_regs *fp) +{ + unsigned long flags; + + spin_lock_irqsave(&io_request_lock, flags); + a3000_intr(irq, dummy, fp); + spin_unlock_irqrestore(&io_request_lock, flags); +} static int dma_setup (Scsi_Cmnd *cmd, int dir_in) { unsigned short cntr = CNTR_PDMD | CNTR_INTEN; @@ -186,7 +194,7 @@ __initfunc(int a3000_detect(Scsi_Host_Template *tpnt)) DMA(a3000_host)->DAWR = DAWR_A3000; wd33c93_init(a3000_host, (wd33c93_regs *)&(DMA(a3000_host)->SASR), dma_setup, dma_stop, WD33C93_FS_12_15); - request_irq(IRQ_AMIGA_PORTS, a3000_intr, 0, "A3000 SCSI", a3000_intr); + request_irq(IRQ_AMIGA_PORTS, do_a3000_intr, 0, "A3000 SCSI", a3000_intr); DMA(a3000_host)->CNTR = CNTR_PDMD | CNTR_INTEN; called = 1; |