From 239f0c4c4c878885932f0052dda22bd0b7a3108f Mon Sep 17 00:00:00 2001
From: adam radford <aradford@gmail.com>
Date: Sat, 8 Oct 2011 18:14:39 -0700
Subject: [PATCH] --- yaml --- r: 271123 b: refs/heads/master c:
 d4a759a954072dcb0a0bbd64ec4bc5252182d032 h: refs/heads/master i:   271121:
 99ec3d9a97249310d6bdec648fd7f2cc6bb35cbf   271119:
 2a792e1c5fb2945d275066a777236425914953a9 v: v3

---
 [refs]                                            | 2 +-
 trunk/drivers/scsi/megaraid/megaraid_sas_fusion.c | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 67e4af957825..912f48a9ea1c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6bf579a326190d09d8c99316fefee7a6a892b891
+refs/heads/master: d4a759a954072dcb0a0bbd64ec4bc5252182d032
diff --git a/trunk/drivers/scsi/megaraid/megaraid_sas_fusion.c b/trunk/drivers/scsi/megaraid/megaraid_sas_fusion.c
index 392b49d93b55..492ad42ff7ac 100644
--- a/trunk/drivers/scsi/megaraid/megaraid_sas_fusion.c
+++ b/trunk/drivers/scsi/megaraid/megaraid_sas_fusion.c
@@ -2057,8 +2057,7 @@ int megasas_reset_fusion(struct Scsi_Host *shost)
 	if (instance->adprecovery == MEGASAS_HW_CRITICAL_ERROR) {
 		printk(KERN_WARNING "megaraid_sas: Hardware critical error, "
 		       "returning FAILED.\n");
-		retval = FAILED;
-		goto out;
+		return FAILED;
 	}
 
 	mutex_lock(&instance->reset_mutex);