From a96a2e43f4a7472003b89e79af227d2141247fd2 Mon Sep 17 00:00:00 2001
From: Yi Zou <yi.zou@intel.com>
Date: Mon, 16 May 2011 16:45:57 -0700
Subject: [PATCH] --- yaml --- r: 252426 b: refs/heads/master c:
 8467b96c035a45418c5db2619f396b7131b4efa8 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 82232036ac55..72b318f8e323 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0a219edb263ef93e4fd7a83804bea667e72a7bfa
+refs/heads/master: 8467b96c035a45418c5db2619f396b7131b4efa8
diff --git a/trunk/drivers/scsi/libfc/fc_fcp.c b/trunk/drivers/scsi/libfc/fc_fcp.c
index 57704e814681..9cd2149519ac 100644
--- a/trunk/drivers/scsi/libfc/fc_fcp.c
+++ b/trunk/drivers/scsi/libfc/fc_fcp.c
@@ -681,8 +681,7 @@ static int fc_fcp_send_data(struct fc_fcp_pkt *fsp, struct fc_seq *seq,
 		error = lport->tt.seq_send(lport, seq, fp);
 		if (error) {
 			WARN_ON(1);		/* send error should be rare */
-			fc_fcp_retry_cmd(fsp);
-			return 0;
+			return error;
 		}
 		fp = NULL;
 	}