patch-2.3.41 linux/drivers/block/icside.c

• Lines: 36
• Date: Thu Jan 27 08:58:15 2000
• Orig file: v2.3.40/linux/drivers/block/icside.c
• Orig date: Tue Dec 14 01:27:23 1999

diff -u --recursive --new-file v2.3.40/linux/drivers/block/icside.c linux/drivers/block/icside.c
@@ -226,7 +226,7 @@
 	unsigned long addr, size;
 	unsigned char *virt_addr;
 	unsigned int count = 0;
-	dmasg_t *sg = (dmasg_t *)HWIF(drive)->dmatable;
+	dmasg_t *sg = (dmasg_t *)HWIF(drive)->dmatable_cpu;
 
 	do {
 		if (bh == NULL) {
@@ -393,7 +393,7 @@
 		 */
 		set_dma_speed(hwif->hw.dma, drive->drive_data);
 
-		set_dma_sg(hwif->hw.dma, (dmasg_t *)hwif->dmatable, count);
+		set_dma_sg(hwif->hw.dma, (dmasg_t *)hwif->dmatable_cpu, count);
 		set_dma_mode(hwif->hw.dma, reading ? DMA_MODE_READ
 			     : DMA_MODE_WRITE);
 
@@ -458,7 +458,7 @@
 	if (!table)
 		printk(" -- ERROR, unable to allocate DMA table\n");
 	else {
-		hwif->dmatable = (void *)table;
+		hwif->dmatable_cpu = (void *)table;
 		hwif->dmaproc = icside_dmaproc;
 		hwif->autodma = autodma;
 
@@ -466,7 +466,7 @@
 			", auto-enable" : "");
 	}
 
-	return hwif->dmatable != NULL;
+	return hwif->dmatable_cpu != NULL;
 }
 #endif