Skip to contentSkip to conversation

2.5.40 - DMA-mapping && misc

PATCH Pete Zaitcev 1 participant 1 message Oct 4, 2002 1 message not in the archive

lore
Share & tools
lore

A message that is not in the archive (sent off-list or not yet received): [email protected]

#1 lore raw
Quoted 12 lines
drivers/scsi/53c7,8xx.c +0 -2
@@ -62,8 +62,6 @@
  *  the fourth byte from 50 to 25.
  */
 
-#error Please convert me to Documentation/DMA-mapping.txt
-
 #include <linux/config.h>
 
 #ifdef CONFIG_SCSI_NCR53C7xx_sync

drivers/scsi/53c7,8xx.c line 3794

Quoted 10 lines
drivers/scsi/53c7,8xx.c +3 -1
@@ -3788,7 +3786,9 @@
     for (i = 0; cmd->use_sg ? (i < cmd->use_sg) : !i; cmd_datain += 4, 
 	cmd_dataout += 4, ++i) {
 	u32 buf = cmd->use_sg ? 
-	    virt_to_bus(((struct scatterlist *)cmd->buffer)[i].address) :
+	    virt_to_bus(
+		page_address(((struct scatterlist *)cmd->buffer)[i].page) +
+		((struct scatterlist *)cmd->buffer)[i].offset ) :
 	    virt_to_bus(cmd->request_buffer);
 	u32 count = cmd->use_sg ?
 	    ((struct scatterlist *)cmd->buffer)[i].length :

These parts contradict. Remove virt_to_bus, then you can take the #error out, but not before.

-- Pete