aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/ide/pci/ns87415.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/ide/pci/ns87415.c')
-rw-r--r--drivers/ide/pci/ns87415.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/drivers/ide/pci/ns87415.c b/drivers/ide/pci/ns87415.c
index 9ffdbb89df5c..76ce112fd857 100644
--- a/drivers/ide/pci/ns87415.c
+++ b/drivers/ide/pci/ns87415.c
@@ -65,7 +65,7 @@ static u8 superio_ide_inb (unsigned long port)
65 65
66static u8 superio_read_sff_dma_status(ide_hwif_t *hwif) 66static u8 superio_read_sff_dma_status(ide_hwif_t *hwif)
67{ 67{
68 return superio_ide_inb(hwif->dma_status); 68 return superio_ide_inb(hwif->dma_base + ATA_DMA_STATUS);
69} 69}
70 70
71static void superio_tf_read(ide_drive_t *drive, ide_task_t *task) 71static void superio_tf_read(ide_drive_t *drive, ide_task_t *task)
@@ -208,13 +208,13 @@ static int ns87415_dma_end(ide_drive_t *drive)
208 208
209 drive->waiting_for_dma = 0; 209 drive->waiting_for_dma = 0;
210 dma_stat = hwif->read_sff_dma_status(hwif); 210 dma_stat = hwif->read_sff_dma_status(hwif);
211 /* get dma command mode */ 211 /* get DMA command mode */
212 dma_cmd = inb(hwif->dma_command); 212 dma_cmd = inb(hwif->dma_base + ATA_DMA_CMD);
213 /* stop DMA */ 213 /* stop DMA */
214 outb(dma_cmd & ~1, hwif->dma_command); 214 outb(dma_cmd & ~1, hwif->dma_base + ATA_DMA_CMD);
215 /* from ERRATA: clear the INTR & ERROR bits */ 215 /* from ERRATA: clear the INTR & ERROR bits */
216 dma_cmd = inb(hwif->dma_command); 216 dma_cmd = inb(hwif->dma_base + ATA_DMA_CMD);
217 outb(dma_cmd | 6, hwif->dma_command); 217 outb(dma_cmd | 6, hwif->dma_base + ATA_DMA_CMD);
218 /* and free any DMA resources */ 218 /* and free any DMA resources */
219 ide_destroy_dmatable(drive); 219 ide_destroy_dmatable(drive);
220 /* verify good DMA status */ 220 /* verify good DMA status */
@@ -298,7 +298,7 @@ static void __devinit init_hwif_ns87415 (ide_hwif_t *hwif)
298 if (!hwif->dma_base) 298 if (!hwif->dma_base)
299 return; 299 return;
300 300
301 outb(0x60, hwif->dma_status); 301 outb(0x60, hwif->dma_base + ATA_DMA_STATUS);
302} 302}
303 303
304static const struct ide_port_ops ns87415_port_ops = { 304static const struct ide_port_ops ns87415_port_ops = {