patch-2.4.19 linux-2.4.19/drivers/scsi/aacraid/comminit.c

Next file: linux-2.4.19/drivers/scsi/aacraid/commsup.c
Previous file: linux-2.4.19/drivers/scsi/aacraid/aacraid.h
Back to the patch index
Back to the overall index

diff -urN linux-2.4.18/drivers/scsi/aacraid/comminit.c linux-2.4.19/drivers/scsi/aacraid/comminit.c
@@ -65,12 +65,12 @@
 		printk(KERN_ERR "aacraid: unable to create mapping.\n");
 		return 0;
 	}
-	dev->comm_addr  = (void *)base;
+	dev->comm_addr = (void *)base;
 	dev->comm_phys = phys;
-	dev->comm_size     = size;
+	dev->comm_size = size;
 
 	dev->init = (struct aac_init *)(base + fibsize);
-	dev->init_pa = (struct aac_init *)(phys + fibsize);
+	dev->init_pa = phys + fibsize;
 
 	init = dev->init;
 
@@ -82,7 +82,7 @@
 	 *	Adapter Fibs are the first thing allocated so that they
 	 *	start page aligned
 	 */
-	init->AdapterFibsVirtualAddress = cpu_to_le32(base);
+	init->AdapterFibsVirtualAddress = cpu_to_le32((long)base);
 	init->AdapterFibsPhysicalAddress = cpu_to_le32(phys);
 	init->AdapterFibsSize = cpu_to_le32(fibsize);
 	init->AdapterFibAlign = cpu_to_le32(sizeof(struct hw_fib));

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)