diff options
author | Ralf Baechle <ralf@linux-mips.org> | 1998-08-25 09:12:35 +0000 |
---|---|---|
committer | Ralf Baechle <ralf@linux-mips.org> | 1998-08-25 09:12:35 +0000 |
commit | c7fc24dc4420057f103afe8fc64524ebc25c5d37 (patch) | |
tree | 3682407a599b8f9f03fc096298134cafba1c9b2f /drivers/scsi/scsiiom.c | |
parent | 1d793fade8b063fde3cf275bf1a5c2d381292cd9 (diff) |
o Merge with Linux 2.1.116.
o New Newport console code.
o New G364 console code.
Diffstat (limited to 'drivers/scsi/scsiiom.c')
-rw-r--r-- | drivers/scsi/scsiiom.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/drivers/scsi/scsiiom.c b/drivers/scsi/scsiiom.c index 09c3407d6..c995a8392 100644 --- a/drivers/scsi/scsiiom.c +++ b/drivers/scsi/scsiiom.c @@ -1426,12 +1426,13 @@ DC390_ScsiRstDetect( PACB pACB ) #ifdef DC390_DEBUG0 printk("RST_DETEC"); #endif - save_flags(flags); - sti(); - wlval = jiffies + HZ; - while( jiffies < wlval ); /* delay 1 sec */ + /* delay a second */ + mdelay(1000); + + save_flags(flags); cli(); + ioport = pACB->IOPortBase; bval = DMA_IDLE_CMD; outb(bval,ioport+DMA_Cmd); |