From 7c07c0df47386f27ade60cc92fbca7c3f2bbac9e Mon Sep 17 00:00:00 2001
From: Tejun Heo <htejun@gmail.com>
Date: Fri, 31 Mar 2006 20:36:47 +0900
Subject: [PATCH] --- yaml --- r: 24951 b: refs/heads/master c:
 e4a70e76add280db6068426716a9b2a74099144f h: refs/heads/master i:   24949:
 4c8a53ce2728c248027cd4eb073ef4f68627ad29   24947:
 779d93b5a106826f65681aafa20fb369677aa2b6   24943:
 ba2e061f082083353b810009c3905619255c9b95 v: v3

---
 [refs]                           | 2 +-
 trunk/drivers/scsi/libata-core.c | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 1f2db85e18f6..ae400fa33e7c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 79ea24e72e59b5f0951483cc4f357afe9bf7ff89
+refs/heads/master: e4a70e76add280db6068426716a9b2a74099144f
diff --git a/trunk/drivers/scsi/libata-core.c b/trunk/drivers/scsi/libata-core.c
index 21b0ed583b8a..eb4df01d9fa0 100644
--- a/trunk/drivers/scsi/libata-core.c
+++ b/trunk/drivers/scsi/libata-core.c
@@ -4006,6 +4006,9 @@ unsigned int ata_qc_issue(struct ata_queued_cmd *qc)
 {
 	struct ata_port *ap = qc->ap;
 
+	qc->ap->active_tag = qc->tag;
+	qc->flags |= ATA_QCFLAG_ACTIVE;
+
 	if (ata_should_dma_map(qc)) {
 		if (qc->flags & ATA_QCFLAG_SG) {
 			if (ata_sg_setup(qc))
@@ -4020,9 +4023,6 @@ unsigned int ata_qc_issue(struct ata_queued_cmd *qc)
 
 	ap->ops->qc_prep(qc);
 
-	qc->ap->active_tag = qc->tag;
-	qc->flags |= ATA_QCFLAG_ACTIVE;
-
 	return ap->ops->qc_issue(qc);
 
 sg_err: