patch-1.3.71 linux/drivers/scsi/ultrastor.c

• Lines: 27
• Date: Mon Mar 4 09:16:40 1996
• Orig file: v1.3.70/linux/drivers/scsi/ultrastor.c
• Orig date: Sat Mar 2 10:43:41 1996

diff -u --recursive --new-file v1.3.70/linux/drivers/scsi/ultrastor.c linux/drivers/scsi/ultrastor.c
@@ -640,14 +640,14 @@
     static char buf[64];
 
     if (config.slot)
-      sprintf(buf, "UltraStor 24F SCSI @ Slot %u IRQ%u\n",
+      sprintf(buf, "UltraStor 24F SCSI @ Slot %u IRQ%u",
 	      config.slot, config.interrupt);
     else if (config.subversion)
-      sprintf(buf, "UltraStor 34F SCSI @ Port %03X BIOS %05X IRQ%u\n",
+      sprintf(buf, "UltraStor 34F SCSI @ Port %03X BIOS %05X IRQ%u",
 	      config.port_address, (int)config.bios_segment,
 	      config.interrupt);
     else
-      sprintf(buf, "UltraStor 14F SCSI @ Port %03X BIOS %05X IRQ%u DMA%u\n",
+      sprintf(buf, "UltraStor 14F SCSI @ Port %03X BIOS %05X IRQ%u DMA%u",
 	      config.port_address, (int)config.bios_segment,
 	      config.interrupt, config.dma_channel);
     return buf;
@@ -884,7 +884,7 @@
 	printk("Ux4F: abort while completed command pending\n");
 	restore_flags(flags);
 	cli();
-	ultrastor_interrupt(0, NULL);
+	ultrastor_interrupt(0, NULL, NULL);
 	restore_flags(flags);
 	return SCSI_ABORT_SUCCESS;  /* FIXME - is this correct? -ERY */
       }