Home Home > GIT Browse
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Gortmaker <p_gortmaker@yahoo.com>2002-02-08 21:17:14 -0800
committerLinus Torvalds <torvalds@home.transmeta.com>2002-02-08 21:17:14 -0800
commit76a58ab34f6cc2614a599e6360e0b1171cac23e3 (patch)
tree97497c585a2daa320b634240151f62805a425fdd
parentbe4258fe862eaa0fa34abb32cca58c16ca21c450 (diff)
[PATCH] 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.
-rw-r--r--drivers/scsi/aha1542.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/scsi/aha1542.c b/drivers/scsi/aha1542.c
index a93ff6dd3d6a..b49fb0e75b98 100644
--- a/drivers/scsi/aha1542.c
+++ b/drivers/scsi/aha1542.c
@@ -58,7 +58,7 @@ static void BAD_DMA(void *address, unsigned int length)
{
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 @@ static void BAD_SG_DMA(Scsi_Cmnd * SCpnt,
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 @@ static int aha1542_queuecommand(Scsi_Cmnd * SCpnt, void (*done) (Scsi_Cmnd *))
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);
};