commit 3f0e58bc8ff80e173660bdfcc514d8a5c4419764
author adam radford <aradford@gmail.com> Sat Oct 08 18:14:59 2011 -0700
committer James Bottomley <JBottomley@Parallels.com> Sun Oct 16 11:20:36 2011 -0500
tree a2d33c2269490dd6a16803118b567d2b56d6e4cf
parent 6497b2475df330437d462c770ee9af0a271d88f9

[SCSI] megaraid_sas: Clear FUSION_IN_RESET before enabling interrupts

Signed-off-by: Adam Radford <aradford@gmail.com>
Signed-off-by: James Bottomley <JBottomley@Parallels.com>

drivers/scsi/megaraid/megaraid_sas_fusion.c

diff --git a/drivers/scsi/megaraid/megaraid_sas_fusion.c b/drivers/scsi/megaraid/megaraid_sas_fusion.c
index ec2e097..120499a 100644
--- a/drivers/scsi/megaraid/megaraid_sas_fusion.c
+++ b/drivers/scsi/megaraid/megaraid_sas_fusion.c
@@ -2179,6 +2179,8 @@
 				continue;
 			}
 
+			clear_bit(MEGASAS_FUSION_IN_RESET,
+				  &instance->reset_flags);
 			instance->instancet->enable_intr(instance->reg_set);
 			instance->adprecovery = MEGASAS_HBA_OPERATIONAL;
 
@@ -2240,6 +2242,7 @@
 		megaraid_sas_kill_hba(instance);
 		retval = FAILED;
 	} else {
+		clear_bit(MEGASAS_FUSION_IN_RESET, &instance->reset_flags);
 		instance->instancet->enable_intr(instance->reg_set);
 		instance->adprecovery = MEGASAS_HBA_OPERATIONAL;
 	}