From 625222f735efdb4a50d7fc58bbfb34a63fc52707 Mon Sep 17 00:00:00 2001
From: Neerav Parikh <Neerav.Parikh@intel.com>
Date: Wed, 27 Jul 2011 15:10:54 -0700
Subject: [PATCH] --- yaml --- r: 261732 b: refs/heads/master c:
 c9d24a76184b3ecbedc66d45f840c3dfd921f12b h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 8097b16000fd..6e16409fe169 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 85982127273be0474e9505c0aac35973a0a013f8
+refs/heads/master: c9d24a76184b3ecbedc66d45f840c3dfd921f12b
diff --git a/trunk/drivers/scsi/libfc/fc_fcp.c b/trunk/drivers/scsi/libfc/fc_fcp.c
index 14dd1215de7f..afb63c843144 100644
--- a/trunk/drivers/scsi/libfc/fc_fcp.c
+++ b/trunk/drivers/scsi/libfc/fc_fcp.c
@@ -1084,6 +1084,7 @@ static int fc_fcp_pkt_send(struct fc_lport *lport, struct fc_fcp_pkt *fsp)
 	rc = lport->tt.fcp_cmd_send(lport, fsp, fc_fcp_recv);
 	if (unlikely(rc)) {
 		spin_lock_irqsave(&si->scsi_queue_lock, flags);
+		fsp->cmd->SCp.ptr = NULL;
 		list_del(&fsp->list);
 		spin_unlock_irqrestore(&si->scsi_queue_lock, flags);
 	}