From cb5b715ccdd0c74f9ebbc08f48a1e6b13797eac1 Mon Sep 17 00:00:00 2001
From: Mike Christie <michaelc@cs.wisc.edu>
Date: Tue, 3 Nov 2009 11:49:54 -0800
Subject: [PATCH] --- yaml --- r: 173686 b: refs/heads/master c:
 349e11faa84ebdd6e484572cfe66f2cf4cb483a1 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 78401d9f2d5f..bc03a1ddef98 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 75ea89ef63d9ca37f190aebb7da061070005ac6e
+refs/heads/master: 349e11faa84ebdd6e484572cfe66f2cf4cb483a1
diff --git a/trunk/drivers/scsi/libfc/fc_fcp.c b/trunk/drivers/scsi/libfc/fc_fcp.c
index 4bfab4f0ccb3..db252e2722d0 100644
--- a/trunk/drivers/scsi/libfc/fc_fcp.c
+++ b/trunk/drivers/scsi/libfc/fc_fcp.c
@@ -2029,7 +2029,6 @@ int fc_eh_device_reset(struct scsi_cmnd *sc_cmd)
 	fsp = fc_fcp_pkt_alloc(lport, GFP_NOIO);
 	if (fsp == NULL) {
 		printk(KERN_WARNING "libfc: could not allocate scsi_pkt\n");
-		sc_cmd->result = DID_NO_CONNECT << 16;
 		goto out;
 	}