summaryrefslogtreecommitdiffstats
path: root/drivers/ata/sata_mv.c
diff options
context:
space:
mode:
authorMark Lord <liml@rtr.ca>2008-01-26 18:32:09 -0500
committerJeff Garzik <jeff@garzik.org>2008-02-01 11:29:47 -0500
commitcb92441973ebd71d556fc7cdd9e597582327dd71 (patch)
tree0e57ca3fbfaccd586f8bacd48a819305c805a1ac /drivers/ata/sata_mv.c
parent8c0aeb4a483334613336ef895f34cecc0ecbbfa6 (diff)
downloadlinux-cb92441973ebd71d556fc7cdd9e597582327dd71.tar.gz
linux-cb92441973ebd71d556fc7cdd9e597582327dd71.tar.bz2
linux-cb92441973ebd71d556fc7cdd9e597582327dd71.zip
sata_mv ncq Ignore response status LSB on NCQ
The lower 8 bits of response status are not valid for NCQ. Signed-off-by: Mark Lord <mlord@pobox.com> Signed-off-by: Jeff Garzik <jeff@garzik.org>
Diffstat (limited to 'drivers/ata/sata_mv.c')
-rw-r--r--drivers/ata/sata_mv.c9
1 files changed, 4 insertions, 5 deletions
diff --git a/drivers/ata/sata_mv.c b/drivers/ata/sata_mv.c
index c60255810e68..207c400c64df 100644
--- a/drivers/ata/sata_mv.c
+++ b/drivers/ata/sata_mv.c
@@ -1590,13 +1590,12 @@ static void mv_intr_edma(struct ata_port *ap)
qc = ata_qc_from_tag(ap, tag);
- /* lower 8 bits of status are EDMA_ERR_IRQ_CAUSE_OFS
- * bits (WARNING: might not necessarily be associated
- * with this command), which -should- be clear
- * if all is well
+ /* For non-NCQ mode, the lower 8 bits of status
+ * are from EDMA_ERR_IRQ_CAUSE_OFS,
+ * which should be zero if all went well.
*/
status = le16_to_cpu(pp->crpb[out_index].flags);
- if (unlikely(status & 0xff)) {
+ if ((status & 0xff) && !(pp->pp_flags & MV_PP_FLAG_NCQ_EN)) {
mv_err_intr(ap, qc);
return;
}