From 76be26cfd8e5168de754327ef8d89965f6d5c45d Mon Sep 17 00:00:00 2001
From: Bhanu Prakash Gollapudi <bprakash@broadcom.com>
Date: Fri, 10 Feb 2012 17:18:57 -0800
Subject: [PATCH] --- yaml --- r: 292959 b: refs/heads/master c:
 0083208473d3d9a87dcdffaf36a2dbe718dfe282 h: refs/heads/master i:   292957:
 5904052953370a5e398317beffba343d5e154c2b   292955:
 ed31fde13f22b050dbbb9bebe307bdfea69a19aa   292951:
 c65b9cbced2402237aae51c53613da5d31bd94ba   292943:
 fff6b437143b36fc3685d70788431f1070f5fa65   292927:
 5c2b26f5a80b3d99425ab04457ec16dc6d05fcb7 v: v3

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

diff --git a/[refs] b/[refs]
index 364b187b4d23..549bbd49faca 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d4042e9c84864a5666dc8ec14b3c1a5597b6a73f
+refs/heads/master: 0083208473d3d9a87dcdffaf36a2dbe718dfe282
diff --git a/trunk/drivers/scsi/libfc/fc_disc.c b/trunk/drivers/scsi/libfc/fc_disc.c
index 1d1b0c9da29b..8e561e6a557c 100644
--- a/trunk/drivers/scsi/libfc/fc_disc.c
+++ b/trunk/drivers/scsi/libfc/fc_disc.c
@@ -337,6 +337,13 @@ static void fc_disc_error(struct fc_disc *disc, struct fc_frame *fp)
 			schedule_delayed_work(&disc->disc_work, delay);
 		} else
 			fc_disc_done(disc, DISC_EV_FAILED);
+	} else if (PTR_ERR(fp) == -FC_EX_CLOSED) {
+		/*
+		 * if discovery fails due to lport reset, clear
+		 * pending flag so that subsequent discovery can
+		 * continue
+		 */
+		disc->pending = 0;
 	}
 }