From: Shivasharan S <shivasharan.srikanteshwara@broadcom.com>
Date: Fri, 10 Feb 2017 08:59:31 +0000 (-0800)
Subject: scsi: megaraid_sas: During OCR, if get_ctrl_info fails do not continue with OCR
X-Git-Tag: v4.1.12-102.0.20170601_1400~12
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=081f9384fa6f29ca74721886d182e43ef8179b18;p=users%2Fjedix%2Flinux-maple.git

scsi: megaraid_sas: During OCR, if get_ctrl_info fails do not continue with OCR

Orabug: 26096381

Error handling: If controller reset is not able to recover, kill HBA and
quit immediately.

Signed-off-by: Kashyap Desai <kashyap.desai@broadcom.com>
Signed-off-by: Shivasharan S <shivasharan.srikanteshwara@broadcom.com>
Reviewed-by: Hannes Reinecke <hare@suse.com>
Reviewed-by: Tomas Henzl <thenzl@redhat.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
(cherry picked from commit a6821ca39e0cac24b4c366b28b07c1a37ce8915d)
Signed-off-by: Somasundaram Krishnasamy <somasundaram.krishnasamy@oracle.com>
Signed-off-by: Kirtikar Kashyap <kirtikar.kashyap@oracle.com>
Reviewed-by: Dhaval Giani <dhaval.giani@oracle.com>
---

diff --git a/drivers/scsi/megaraid/megaraid_sas_fusion.c b/drivers/scsi/megaraid/megaraid_sas_fusion.c
index 6cfdc74259fc0..1c28aa6e318ab 100644
--- a/drivers/scsi/megaraid/megaraid_sas_fusion.c
+++ b/drivers/scsi/megaraid/megaraid_sas_fusion.c
@@ -4011,6 +4011,7 @@ transition_to_ready:
 					__func__, __LINE__);
 				megaraid_sas_kill_hba(instance);
 				retval = FAILED;
+				goto out;
 			}
 			/* Reset load balance info */
 			if (fusion->load_balance_info)