patch-2.2.14 linux/drivers/scsi/aic7xxx_proc.c

• Lines: 27
• Date: Tue Jan 4 10:12:19 2000
• Orig file: v2.2.13/linux/drivers/scsi/aic7xxx_proc.c
• Orig date: Mon Aug 9 16:05:56 1999

diff -u --recursive --new-file v2.2.13/linux/drivers/scsi/aic7xxx_proc.c linux/drivers/scsi/aic7xxx_proc.c
@@ -224,6 +224,11 @@
   {
     size += sprintf(BLS, "    BIOS Memory Address: 0x%08x\n", p->bios_address);
   }
+  if( p->chip & AHC_PCI )
+  {
+    size += sprintf(BLS, "    PCI Bus 0x%02x Device 0x%02x\n", p->pci_bus,
+              p->pci_device_fn);
+  }
   size += sprintf(BLS, " Adapter SEEPROM Config: %s\n",
           (p->flags & AHC_SEEPROM_FOUND) ? "SEEPROM found and used." :
          ((p->flags & AHC_USEDEFAULTS) ? "SEEPROM not found, using defaults." :
@@ -373,11 +378,9 @@
   }
   else
   {
-    *start = &aic7xxx_buffer[offset];   /* Start of wanted data */
-    if (size - offset < length)
-    {
-      length = size - offset;
-    }
+    *start = buffer;
+    length = MIN(length, size - offset);
+    memcpy(buffer, &aic7xxx_buffer[offset], length);
   }
 
   return (length);