aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/ide/hpt366.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/ide/hpt366.c b/drivers/ide/hpt366.c
index cea1ac222a90..0feb66c720e1 100644
--- a/drivers/ide/hpt366.c
+++ b/drivers/ide/hpt366.c
@@ -3,7 +3,7 @@
3 * Portions Copyright (C) 2001 Sun Microsystems, Inc. 3 * Portions Copyright (C) 2001 Sun Microsystems, Inc.
4 * Portions Copyright (C) 2003 Red Hat Inc 4 * Portions Copyright (C) 2003 Red Hat Inc
5 * Portions Copyright (C) 2007 Bartlomiej Zolnierkiewicz 5 * Portions Copyright (C) 2007 Bartlomiej Zolnierkiewicz
6 * Portions Copyright (C) 2005-2008 MontaVista Software, Inc. 6 * Portions Copyright (C) 2005-2009 MontaVista Software, Inc.
7 * 7 *
8 * Thanks to HighPoint Technologies for their assistance, and hardware. 8 * Thanks to HighPoint Technologies for their assistance, and hardware.
9 * Special Thanks to Jon Burchmore in SanDiego for the deep pockets, his 9 * Special Thanks to Jon Burchmore in SanDiego for the deep pockets, his
@@ -810,7 +810,7 @@ static void hpt370_irq_timeout(ide_drive_t *drive)
810 /* get DMA command mode */ 810 /* get DMA command mode */
811 dma_cmd = inb(hwif->dma_base + ATA_DMA_CMD); 811 dma_cmd = inb(hwif->dma_base + ATA_DMA_CMD);
812 /* stop DMA */ 812 /* stop DMA */
813 outb(dma_cmd & ~0x1, hwif->dma_base + ATA_DMA_CMD); 813 outb(dma_cmd & ~ATA_DMA_START, hwif->dma_base + ATA_DMA_CMD);
814 hpt370_clear_engine(drive); 814 hpt370_clear_engine(drive);
815} 815}
816 816
@@ -827,11 +827,11 @@ static int hpt370_dma_end(ide_drive_t *drive)
827 ide_hwif_t *hwif = drive->hwif; 827 ide_hwif_t *hwif = drive->hwif;
828 u8 dma_stat = inb(hwif->dma_base + ATA_DMA_STATUS); 828 u8 dma_stat = inb(hwif->dma_base + ATA_DMA_STATUS);
829 829
830 if (dma_stat & 0x01) { 830 if (dma_stat & ATA_DMA_ACTIVE) {
831 /* wait a little */ 831 /* wait a little */
832 udelay(20); 832 udelay(20);
833 dma_stat = inb(hwif->dma_base + ATA_DMA_STATUS); 833 dma_stat = inb(hwif->dma_base + ATA_DMA_STATUS);
834 if (dma_stat & 0x01) 834 if (dma_stat & ATA_DMA_ACTIVE)
835 hpt370_irq_timeout(drive); 835 hpt370_irq_timeout(drive);
836 } 836 }
837 return ide_dma_end(drive); 837 return ide_dma_end(drive);
@@ -853,7 +853,7 @@ static int hpt374_dma_test_irq(ide_drive_t *drive)
853 853
854 dma_stat = inb(hwif->dma_base + ATA_DMA_STATUS); 854 dma_stat = inb(hwif->dma_base + ATA_DMA_STATUS);
855 /* return 1 if INTR asserted */ 855 /* return 1 if INTR asserted */
856 if (dma_stat & 4) 856 if (dma_stat & ATA_DMA_INTR)
857 return 1; 857 return 1;
858 858
859 return 0; 859 return 0;