Skip to contentSkip to conversation

2.5.4pre5 scsi/aha1542.c & DMA changes

PATCH New Paul Gortmaker 1 participant 1 message Feb 9, 2002

lore
Share & tools
lore

Paul Gortmaker

author
#0 lore raw

PATCH 1/1 2.5.4pre5 scsi/aha1542.c & DMA changes

There are a couple of errors in the DMA changes to the aha1542.c driver that appeared in 2.5.4pre3:

- a typo (BUF vs BUS)
- a macro handed a page instead of a scatterlist
- printk format length mismatch

Paul.

scsi/aha1542.c renamed from scsi/aha1542.c~ +3 -3
@@ -58,7 +58,7 @@
 {
 	printk(KERN_CRIT "buf vaddress %p paddress 0x%lx length %d\n",
 	       address,
-	       SCSI_BUS_PA(address),
+	       SCSI_BUF_PA(address),
 	       length);
 	panic("Buffer at physical address > 16Mb used for aha1542");
 }

@@ -68,7 +68,7 @@
 		       int nseg,
 		       int badseg)
 {
-	printk(KERN_CRIT "sgpnt[%d:%d] page %p/0x%lx length %d\n",
+	printk(KERN_CRIT "sgpnt[%d:%d] page %p/0x%x length %d\n",
 	       badseg, nseg,
 	       page_address(sgpnt[badseg].page) + sgpnt[badseg].offset,
 	       SCSI_SG_PA(&sgpnt[badseg]),

@@ -727,7 +727,7 @@
 				panic("Foooooooood fight!");
 			};
 			any2scsi(cptr[i].dataptr, SCSI_SG_PA(&sgpnt[i]));
-			if (SCSI_SG_PA(&sgpnt[i].page) + sgpnt[i].length - 1 > ISA_DMA_THRESHOLD)
+			if (SCSI_SG_PA(&sgpnt[i]) + sgpnt[i].length - 1 > ISA_DMA_THRESHOLD)
 				BAD_SG_DMA(SCpnt, sgpnt, SCpnt->use_sg, i);
 			any2scsi(cptr[i].datalen, sgpnt[i].length);
 		};