diff options
Diffstat (limited to 'linux/src/drivers/scsi/ultrastor.c')
| -rw-r--r-- | linux/src/drivers/scsi/ultrastor.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/linux/src/drivers/scsi/ultrastor.c b/linux/src/drivers/scsi/ultrastor.c index a1a1982d..de824726 100644 --- a/linux/src/drivers/scsi/ultrastor.c +++ b/linux/src/drivers/scsi/ultrastor.c @@ -333,7 +333,7 @@ static void log_ultrastor_abort(register struct ultrastor_config *config, { static char fmt[80] = "abort %d (%x); MSCP free pool: %x;"; register int i; - int flags; + unsigned long flags; save_flags(flags); cli(); @@ -681,7 +681,7 @@ int ultrastor_queuecommand(Scsi_Cmnd *SCpnt, void (*done)(Scsi_Cmnd *)) int mscp_index; #endif unsigned int status; - int flags; + unsigned long flags; /* Next test is for debugging; "can't happen" */ if ((config.mscp_free & ((1U << ULTRASTOR_MAX_CMDS) - 1)) == 0) @@ -853,7 +853,7 @@ int ultrastor_abort(Scsi_Cmnd *SCpnt) { int port0 = (config.slot << 12) | 0xc80; int i; - int flags; + unsigned long flags; save_flags(flags); cli(); strcpy(out, "OGM %d:%x ICM %d:%x ports: "); @@ -879,7 +879,7 @@ int ultrastor_abort(Scsi_Cmnd *SCpnt) if (config.slot ? inb(config.icm_address - 1) == 2 : (inb(SYS_DOORBELL_INTR(config.doorbell_address)) & 1)) { - int flags; + unsigned long flags; save_flags(flags); printk("Ux4F: abort while completed command pending\n"); restore_flags(flags); @@ -901,7 +901,7 @@ int ultrastor_abort(Scsi_Cmnd *SCpnt) and the interrupt handler will call done. */ if (config.slot && inb(config.ogm_address - 1) == 0) { - int flags; + unsigned long flags; save_flags(flags); cli(); @@ -953,7 +953,7 @@ int ultrastor_abort(Scsi_Cmnd *SCpnt) int ultrastor_reset(Scsi_Cmnd * SCpnt, unsigned int reset_flags) { - int flags; + unsigned long flags; register int i; #if (ULTRASTOR_DEBUG & UD_RESET) printk("US14F: reset: called\n"); |