diff options
Diffstat (limited to 'drivers/ide/pci/scc_pata.c')
-rw-r--r-- | drivers/ide/pci/scc_pata.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/ide/pci/scc_pata.c b/drivers/ide/pci/scc_pata.c index 44cccd1e086a..e92a874b31df 100644 --- a/drivers/ide/pci/scc_pata.c +++ b/drivers/ide/pci/scc_pata.c | |||
@@ -26,7 +26,6 @@ | |||
26 | #include <linux/module.h> | 26 | #include <linux/module.h> |
27 | #include <linux/pci.h> | 27 | #include <linux/pci.h> |
28 | #include <linux/delay.h> | 28 | #include <linux/delay.h> |
29 | #include <linux/hdreg.h> | ||
30 | #include <linux/ide.h> | 29 | #include <linux/ide.h> |
31 | #include <linux/init.h> | 30 | #include <linux/init.h> |
32 | 31 | ||
@@ -400,7 +399,7 @@ static int scc_dma_end(ide_drive_t *drive) | |||
400 | /* errata A308 workaround: Step5 (check data loss) */ | 399 | /* errata A308 workaround: Step5 (check data loss) */ |
401 | /* We don't check non ide_disk because it is limited to UDMA4 */ | 400 | /* We don't check non ide_disk because it is limited to UDMA4 */ |
402 | if (!(in_be32((void __iomem *)hwif->io_ports.ctl_addr) | 401 | if (!(in_be32((void __iomem *)hwif->io_ports.ctl_addr) |
403 | & ERR_STAT) && | 402 | & ATA_ERR) && |
404 | drive->media == ide_disk && drive->current_speed > XFER_UDMA_4) { | 403 | drive->media == ide_disk && drive->current_speed > XFER_UDMA_4) { |
405 | reg = in_be32((void __iomem *)intsts_port); | 404 | reg = in_be32((void __iomem *)intsts_port); |
406 | if (!(reg & INTSTS_ACTEINT)) { | 405 | if (!(reg & INTSTS_ACTEINT)) { |
@@ -504,7 +503,7 @@ static int scc_dma_test_irq(ide_drive_t *drive) | |||
504 | 503 | ||
505 | /* SCC errata A252,A308 workaround: Step4 */ | 504 | /* SCC errata A252,A308 workaround: Step4 */ |
506 | if ((in_be32((void __iomem *)hwif->io_ports.ctl_addr) | 505 | if ((in_be32((void __iomem *)hwif->io_ports.ctl_addr) |
507 | & ERR_STAT) && | 506 | & ATA_ERR) && |
508 | (int_stat & INTSTS_INTRQ)) | 507 | (int_stat & INTSTS_INTRQ)) |
509 | return 1; | 508 | return 1; |
510 | 509 | ||