From 1484067365fcad303769a7f0abc3b6d50c0f27e4 Mon Sep 17 00:00:00 2001
From: Mark Lord <liml@rtr.ca>
Date: Fri, 30 Jan 2009 18:49:29 -0500
Subject: [PATCH] --- yaml --- r: 133572 b: refs/heads/master c:
 95db505125fb7bc624b7c3b6747bbeaebbffc2e4 h: refs/heads/master v: v3

---
 [refs]                      | 2 +-
 trunk/drivers/ata/sata_mv.c | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index d3c8b2d0672a..551b60950bb0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f48765ccb48a62596b664aa88a2b0f943c12c0e1
+refs/heads/master: 95db505125fb7bc624b7c3b6747bbeaebbffc2e4
diff --git a/trunk/drivers/ata/sata_mv.c b/trunk/drivers/ata/sata_mv.c
index 0c25f52249df..181f02127410 100644
--- a/trunk/drivers/ata/sata_mv.c
+++ b/trunk/drivers/ata/sata_mv.c
@@ -1628,6 +1628,12 @@ static struct ata_queued_cmd *mv_get_active_qc(struct ata_port *ap)
 	if (pp->pp_flags & MV_PP_FLAG_NCQ_EN)
 		return NULL;
 	qc = ata_qc_from_tag(ap, ap->link.active_tag);
+	if (qc) {
+		if (qc->tf.flags & ATA_TFLAG_POLLING)
+			qc = NULL;
+		else if (!(qc->flags & ATA_QCFLAG_ACTIVE))
+			qc = NULL;
+	}
 	if (qc && (qc->tf.flags & ATA_TFLAG_POLLING))
 		qc = NULL;
 	return qc;