diff options
Diffstat (limited to 'drivers/scsi')
-rw-r--r-- | drivers/scsi/sun3x_esp.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/scsi/sun3x_esp.c b/drivers/scsi/sun3x_esp.c index cc990bed9683..2e2c1eb15636 100644 --- a/drivers/scsi/sun3x_esp.c +++ b/drivers/scsi/sun3x_esp.c | |||
@@ -332,11 +332,11 @@ static void dma_mmu_get_scsi_sgl (struct NCR_ESP *esp, Scsi_Cmnd *sp) | |||
332 | struct scatterlist *sg = sp->SCp.buffer; | 332 | struct scatterlist *sg = sp->SCp.buffer; |
333 | 333 | ||
334 | while (sz >= 0) { | 334 | while (sz >= 0) { |
335 | sg[sz].dvma_address = dvma_map((unsigned long)page_address(sg[sz].page) + | 335 | sg[sz].dma_address = dvma_map((unsigned long)page_address(sg[sz].page) + |
336 | sg[sz].offset, sg[sz].length); | 336 | sg[sz].offset, sg[sz].length); |
337 | sz--; | 337 | sz--; |
338 | } | 338 | } |
339 | sp->SCp.ptr=(char *)((unsigned long)sp->SCp.buffer->dvma_address); | 339 | sp->SCp.ptr=(char *)((unsigned long)sp->SCp.buffer->dma_address); |
340 | } | 340 | } |
341 | 341 | ||
342 | static void dma_mmu_release_scsi_one (struct NCR_ESP *esp, Scsi_Cmnd *sp) | 342 | static void dma_mmu_release_scsi_one (struct NCR_ESP *esp, Scsi_Cmnd *sp) |
@@ -350,14 +350,14 @@ static void dma_mmu_release_scsi_sgl (struct NCR_ESP *esp, Scsi_Cmnd *sp) | |||
350 | struct scatterlist *sg = (struct scatterlist *)sp->buffer; | 350 | struct scatterlist *sg = (struct scatterlist *)sp->buffer; |
351 | 351 | ||
352 | while(sz >= 0) { | 352 | while(sz >= 0) { |
353 | dvma_unmap((char *)sg[sz].dvma_address); | 353 | dvma_unmap((char *)sg[sz].dma_address); |
354 | sz--; | 354 | sz--; |
355 | } | 355 | } |
356 | } | 356 | } |
357 | 357 | ||
358 | static void dma_advance_sg (Scsi_Cmnd *sp) | 358 | static void dma_advance_sg (Scsi_Cmnd *sp) |
359 | { | 359 | { |
360 | sp->SCp.ptr = (char *)((unsigned long)sp->SCp.buffer->dvma_address); | 360 | sp->SCp.ptr = (char *)((unsigned long)sp->SCp.buffer->dma_address); |
361 | } | 361 | } |
362 | 362 | ||
363 | static int sun3x_esp_release(struct Scsi_Host *instance) | 363 | static int sun3x_esp_release(struct Scsi_Host *instance) |