patch-2.1.102 linux/drivers/scsi/u14-34f.c
Next file: linux/drivers/scsi/wd33c93.c
Previous file: linux/drivers/scsi/sr_ioctl.c
Back to the patch index
Back to the overall index
- Lines: 28
- Date:
Mon May 11 11:29:38 1998
- Orig file:
v2.1.101/linux/drivers/scsi/u14-34f.c
- Orig date:
Sat Apr 25 18:13:11 1998
diff -u --recursive --new-file v2.1.101/linux/drivers/scsi/u14-34f.c linux/drivers/scsi/u14-34f.c
@@ -629,10 +629,8 @@
/* Issue OGM interrupt */
outb(CMD_OGM_INTR, sh[j]->io_port + REG_LCL_INTR);
- sti();
- time = jiffies;
- while ((jiffies - time) < HZ && limit++ < 20000) udelay(100L);
- cli();
+ /* Wait a second.. */
+ { unsigned int msec = 1000; while (--msec) udelay(1000); }
if (cpp->adapter_status || HD(j)->cp_stat[0] != FREE) {
HD(j)->cp_stat[0] = FREE;
@@ -1233,10 +1231,10 @@
#endif
HD(j)->in_reset = TRUE;
- sti();
- time = jiffies;
- while ((jiffies - time) < (10 * HZ) && limit++ < 200000) udelay(100L);
- cli();
+
+ /* Wait 2 seconds ???!!! */
+ { unsigned int msec = 2*1000; while (--msec) udelay(1000); }
+
printk("%s: reset, interrupts disabled, loops %d.\n", BN(j), limit);
for (i = 0; i < sh[j]->can_queue; i++) {
FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen, slshen@lbl.gov