From d446442d3ad667d601c4fab9bd1a7821295f2f63 Mon Sep 17 00:00:00 2001 From: Mark Lord Date: Sat, 26 Jan 2008 18:32:09 -0500 Subject: [PATCH] --- yaml --- r: 82047 b: refs/heads/master c: cb92441973ebd71d556fc7cdd9e597582327dd71 h: refs/heads/master i: 82045: 1a5dd7b33c23fe785e891029bbab69a7fe8bdbe2 82043: c315bea68b90552df1ccdb98c85cb267b1e12fa0 82039: 7e21eca4213716cd30558265f2063a627d7cb7c5 82031: 059e66c7da535cfb6163b981e6a962a0fd9ea3f1 82015: 68d6296c44c5c607017ed37ae603a684bebb7051 81983: 2e6157e45588ebeeeab40cffc59e9ac6d814411f 81919: 86990bbb9e4622883ae58e694d03b932f7543f22 v: v3 --- [refs] | 2 +- trunk/drivers/ata/sata_mv.c | 9 ++++----- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 40285f3a04d8..0372a4277c94 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8c0aeb4a483334613336ef895f34cecc0ecbbfa6 +refs/heads/master: cb92441973ebd71d556fc7cdd9e597582327dd71 diff --git a/trunk/drivers/ata/sata_mv.c b/trunk/drivers/ata/sata_mv.c index c60255810e68..207c400c64df 100644 --- a/trunk/drivers/ata/sata_mv.c +++ b/trunk/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; }