patch-2.4.7 linux/drivers/scsi/BusLogic.c

• Lines: 34
• Date: Thu Jul 5 11:28:16 2001
• Orig file: v2.4.6/linux/drivers/scsi/BusLogic.c
• Orig date: Sat Nov 11 19:01:11 2000

diff -u --recursive --new-file v2.4.6/linux/drivers/scsi/BusLogic.c linux/drivers/scsi/BusLogic.c
@@ -770,15 +770,19 @@
       BusLogic_ModifyIOAddressRequest_T ModifyIOAddressRequest;
       unsigned char Bus = PCI_Device->bus->number;
       unsigned char Device = PCI_Device->devfn >> 3;
-      unsigned int IRQ_Channel = PCI_Device->irq;
-      unsigned long BaseAddress0 = pci_resource_start(PCI_Device, 0);
-      unsigned long BaseAddress1 = pci_resource_start(PCI_Device, 1);
-      BusLogic_IO_Address_T IO_Address = BaseAddress0;
-      BusLogic_PCI_Address_T PCI_Address = BaseAddress1;
+      unsigned int IRQ_Channel;
+      unsigned long BaseAddress0;
+      unsigned long BaseAddress1;
+      BusLogic_IO_Address_T IO_Address;
+      BusLogic_PCI_Address_T PCI_Address;
 
       if (pci_enable_device(PCI_Device))
       	continue;
       
+      IRQ_Channel = PCI_Device->irq;
+      IO_Address  = BaseAddress0 = pci_resource_start(PCI_Device, 0);
+      PCI_Address = BaseAddress1 = pci_resource_start(PCI_Device, 1);
+
       if (pci_resource_flags(PCI_Device, 0) & IORESOURCE_MEM)
 	{
 	  BusLogic_Error("BusLogic: Base Address0 0x%X not I/O for "
@@ -2547,7 +2551,7 @@
 	  int SynchronousTransferRate = 0;
 	  if (BusLogic_FlashPointHostAdapterP(HostAdapter))
 	    {
-	      boolean WideTransfersActive;
+	      unsigned char WideTransfersActive;
 	      FlashPoint_InquireTargetInfo(
 		HostAdapter->CardHandle, TargetID,
 		&HostAdapter->SynchronousPeriod[TargetID],