From 9e9d6ef84e0a444686c3a4051c5c3876d48c8df6 Mon Sep 17 00:00:00 2001 From: Bartlomiej Zolnierkiewicz Date: Tue, 15 Jul 2008 21:21:47 +0200 Subject: [PATCH] --- yaml --- r: 101215 b: refs/heads/master c: 912ef6d94cc07ce5db19a8ed8953676727d4f30c h: refs/heads/master i: 101213: be416ab79b62297b1a2a3d511803b90f867a556f 101211: 5c23c95e2129800a5f35cb19bfe3d014ca5d3442 101207: a3c2a2b838f2452d302be7b55d9177e5c9d0a439 101199: fd79583dcbb9ff900211a7fdb283c2436717bdd0 101183: f64d41842db71cd9d0fe98b8ddc06ad077a68baf v: v3 --- [refs] | 2 +- trunk/drivers/ide/pci/sgiioc4.c | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index d74ecd417ba1..f087b270f42b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 57279a7a401eed844ded4346c5ff512e622ac1de +refs/heads/master: 912ef6d94cc07ce5db19a8ed8953676727d4f30c diff --git a/trunk/drivers/ide/pci/sgiioc4.c b/trunk/drivers/ide/pci/sgiioc4.c index 16a0bce17d69..c1b667c53f2b 100644 --- a/trunk/drivers/ide/pci/sgiioc4.c +++ b/trunk/drivers/ide/pci/sgiioc4.c @@ -369,8 +369,7 @@ ide_dma_sgiioc4(ide_hwif_t *hwif, const struct ide_port_info *d) hwif->sg_max_nents = IOC4_PRD_ENTRIES; pad = pci_alloc_consistent(dev, IOC4_IDE_CACHELINE_SIZE, - (dma_addr_t *) &(hwif->dma_status)); - + (dma_addr_t *)&hwif->extra_base); if (pad) { ide_set_hwifdata(hwif, pad); return 0; @@ -439,7 +438,7 @@ sgiioc4_configure_for_dma(int dma_direction, ide_drive_t * drive) /* Address of the Ending DMA */ memset(ide_get_hwifdata(hwif), 0, IOC4_IDE_CACHELINE_SIZE); - ending_dma_addr = cpu_to_le32(hwif->dma_status); + ending_dma_addr = cpu_to_le32(hwif->extra_base); writel(ending_dma_addr, (void __iomem *)(dma_base + IOC4_DMA_END_ADDR * 4)); writel(dma_direction, (void __iomem *)ioc4_dma_addr);