From 5e90698f44199b86ac92c1d66a0a306bab23756c Mon Sep 17 00:00:00 2001
From: "Darrick J. Wong" <djwong@us.ibm.com>
Date: Tue, 14 Nov 2006 09:55:41 -0500
Subject: [PATCH] --- yaml --- r: 40916 b: refs/heads/master c:
 253b92ecbd3d2e9f5a79fc7632c89ac74bff16c4 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 0b62c769934e..6a7d80a9e424 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3f9dd27a22ff79b6b6c4eccd19e4063bff0ddc7e
+refs/heads/master: 253b92ecbd3d2e9f5a79fc7632c89ac74bff16c4
diff --git a/trunk/drivers/ata/libata-scsi.c b/trunk/drivers/ata/libata-scsi.c
index 7af2a4ba4990..5c1fc467fc7f 100644
--- a/trunk/drivers/ata/libata-scsi.c
+++ b/trunk/drivers/ata/libata-scsi.c
@@ -1612,9 +1612,9 @@ static int ata_scsi_translate(struct ata_device *dev, struct scsi_cmnd *cmd,
 
 err_did:
 	ata_qc_free(qc);
-err_mem:
 	cmd->result = (DID_ERROR << 16);
 	done(cmd);
+err_mem:
 	DPRINTK("EXIT - internal\n");
 	return 0;