2 files changed, 5 insertions, 5 deletions

diff --git a/drivers/ide/pci/ns87415.c b/drivers/ide/pci/ns87415.c
index ffefcd15196c..17685f0ade13 100644
--- a/drivers/ide/pci/ns87415.c
+++ b/drivers/ide/pci/ns87415.c
@@ -274,9 +274,9 @@ static void __devinit init_hwif_ns87415 (ide_hwif_t *hwif)
                 do {
                         udelay(50);
                         stat = hwif->tp_ops->read_status(hwif);
-                        if (stat == 0xff)
-                                break;
-                } while ((stat & BUSY_STAT) && --timeout);
+                        if (stat == 0xff)
+                                break;
+                } while ((stat & ATA_BUSY) && --timeout);
 #endif
         }
 
diff --git a/drivers/ide/pci/scc_pata.c b/drivers/ide/pci/scc_pata.c
index 44cccd1e086a..192a6a70a631 100644
--- a/drivers/ide/pci/scc_pata.c
+++ b/drivers/ide/pci/scc_pata.c
@@ -400,7 +400,7 @@ static int scc_dma_end(ide_drive_t *drive)
         /* errata A308 workaround: Step5 (check data loss) */
         /* We don't check non ide_disk because it is limited to UDMA4 */
         if (!(in_be32((void __iomem *)hwif->io_ports.ctl_addr)
-              & ERR_STAT) &&
+              & ATA_ERR) &&
             drive->media == ide_disk && drive->current_speed > XFER_UDMA_4) {
                 reg = in_be32((void __iomem *)intsts_port);
                 if (!(reg & INTSTS_ACTEINT)) {
@@ -504,7 +504,7 @@ static int scc_dma_test_irq(ide_drive_t *drive)
 
         /* SCC errata A252,A308 workaround: Step4 */
         if ((in_be32((void __iomem *)hwif->io_ports.ctl_addr)
-             & ERR_STAT) &&
+             & ATA_ERR) &&
             (int_stat & INTSTS_INTRQ))
                 return 1;