aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/scsi/sata_sx4.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/scsi/sata_sx4.c')
-rw-r--r--drivers/scsi/sata_sx4.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/scsi/sata_sx4.c b/drivers/scsi/sata_sx4.c
index 8710d0f14f93..8e2e7b8308c0 100644
--- a/drivers/scsi/sata_sx4.c
+++ b/drivers/scsi/sata_sx4.c
@@ -717,7 +717,7 @@ static inline unsigned int pdc20621_host_intr( struct ata_port *ap,
717 VPRINTK("ata%u: read hdma, 0x%x 0x%x\n", ap->id, 717 VPRINTK("ata%u: read hdma, 0x%x 0x%x\n", ap->id,
718 readl(mmio + 0x104), readl(mmio + PDC_HDMA_CTLSTAT)); 718 readl(mmio + 0x104), readl(mmio + PDC_HDMA_CTLSTAT));
719 /* get drive status; clear intr; complete txn */ 719 /* get drive status; clear intr; complete txn */
720 ata_qc_complete(qc, ata_wait_idle(ap)); 720 ata_qc_complete(qc, ac_err_mask(ata_wait_idle(ap)));
721 pdc20621_pop_hdma(qc); 721 pdc20621_pop_hdma(qc);
722 } 722 }
723 723
@@ -755,7 +755,7 @@ static inline unsigned int pdc20621_host_intr( struct ata_port *ap,
755 VPRINTK("ata%u: write ata, 0x%x 0x%x\n", ap->id, 755 VPRINTK("ata%u: write ata, 0x%x 0x%x\n", ap->id,
756 readl(mmio + 0x104), readl(mmio + PDC_HDMA_CTLSTAT)); 756 readl(mmio + 0x104), readl(mmio + PDC_HDMA_CTLSTAT));
757 /* get drive status; clear intr; complete txn */ 757 /* get drive status; clear intr; complete txn */
758 ata_qc_complete(qc, ata_wait_idle(ap)); 758 ata_qc_complete(qc, ac_err_mask(ata_wait_idle(ap)));
759 pdc20621_pop_hdma(qc); 759 pdc20621_pop_hdma(qc);
760 } 760 }
761 handled = 1; 761 handled = 1;
@@ -765,7 +765,7 @@ static inline unsigned int pdc20621_host_intr( struct ata_port *ap,
765 765
766 status = ata_busy_wait(ap, ATA_BUSY | ATA_DRQ, 1000); 766 status = ata_busy_wait(ap, ATA_BUSY | ATA_DRQ, 1000);
767 DPRINTK("BUS_NODATA (drv_stat 0x%X)\n", status); 767 DPRINTK("BUS_NODATA (drv_stat 0x%X)\n", status);
768 ata_qc_complete(qc, status); 768 ata_qc_complete(qc, ac_err_mask(status));
769 handled = 1; 769 handled = 1;
770 770
771 } else { 771 } else {
@@ -880,7 +880,7 @@ static void pdc_eng_timeout(struct ata_port *ap)
880 case ATA_PROT_DMA: 880 case ATA_PROT_DMA:
881 case ATA_PROT_NODATA: 881 case ATA_PROT_NODATA:
882 printk(KERN_ERR "ata%u: command timeout\n", ap->id); 882 printk(KERN_ERR "ata%u: command timeout\n", ap->id);
883 ata_qc_complete(qc, ata_wait_idle(ap) | ATA_ERR); 883 ata_qc_complete(qc, __ac_err_mask(ata_wait_idle(ap)));
884 break; 884 break;
885 885
886 default: 886 default:
@@ -889,7 +889,7 @@ static void pdc_eng_timeout(struct ata_port *ap)
889 printk(KERN_ERR "ata%u: unknown timeout, cmd 0x%x stat 0x%x\n", 889 printk(KERN_ERR "ata%u: unknown timeout, cmd 0x%x stat 0x%x\n",
890 ap->id, qc->tf.command, drv_stat); 890 ap->id, qc->tf.command, drv_stat);
891 891
892 ata_qc_complete(qc, drv_stat); 892 ata_qc_complete(qc, ac_err_mask(drv_stat));
893 break; 893 break;
894 } 894 }
895 895