From: James Smart <james.smart@avagotech.com>
Date: Thu, 21 May 2015 17:55:17 +0000 (-0400)
Subject: lpfc: Correct loss of target discovery after cable swap.
X-Git-Tag: v4.1.12-92~249^2~3^2~23
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=d08cbef6d29b4d20528aaff03b050bc999e658d8;p=users%2Fjedix%2Flinux-maple.git

lpfc: Correct loss of target discovery after cable swap.

Fix incorrect reference counting

Signed-off-by: Dick Kennedy <dick.kennedy@avagotech.com>
Signed-off-by: James Smart <james.smart@avagotech.com>
Reviewed-by: Hannes Reinecke <hare@suse.de>
Signed-off-by: James Bottomley <JBottomley@Odin.com>
(cherry picked from commit 0290217ad830f2813bb9ed5f51af686c0c591f28)

Orabug: 22029622
From dick.kennedy@avagotech.com lpfc-10.5.0.1-11.0.0.3-1.tar.gz
Acked-by: Chuck Anderson <chuck.anderson@oracle.com>
---

diff --git a/drivers/scsi/lpfc/lpfc_hbadisc.c b/drivers/scsi/lpfc/lpfc_hbadisc.c
index e2426f858ec19..11b60449ce774 100644
--- a/drivers/scsi/lpfc/lpfc_hbadisc.c
+++ b/drivers/scsi/lpfc/lpfc_hbadisc.c
@@ -4299,9 +4299,9 @@ lpfc_drop_node(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp)
 	if (vport->phba->sli_rev == LPFC_SLI_REV4) {
 		lpfc_cleanup_vports_rrqs(vport, ndlp);
 		lpfc_unreg_rpi(vport, ndlp);
-	} else {
-		lpfc_nlp_put(ndlp);
 	}
+
+	lpfc_nlp_put(ndlp);
 	return;
 }