aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/scsi
diff options
context:
space:
mode:
authoradam radford <aradford@gmail.com>2011-10-08 21:14:59 -0400
committerJames Bottomley <JBottomley@Parallels.com>2011-10-16 12:20:36 -0400
commit3f0e58bc8ff80e173660bdfcc514d8a5c4419764 (patch)
treea2d33c2269490dd6a16803118b567d2b56d6e4cf /drivers/scsi
parent6497b2475df330437d462c770ee9af0a271d88f9 (diff)
[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>
Diffstat (limited to 'drivers/scsi')
-rw-r--r--drivers/scsi/megaraid/megaraid_sas_fusion.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/scsi/megaraid/megaraid_sas_fusion.c b/drivers/scsi/megaraid/megaraid_sas_fusion.c
index ec2e097f7737..120499ade9a5 100644
--- a/drivers/scsi/megaraid/megaraid_sas_fusion.c
+++ b/drivers/scsi/megaraid/megaraid_sas_fusion.c
@@ -2179,6 +2179,8 @@ int megasas_reset_fusion(struct Scsi_Host *shost)
2179 continue; 2179 continue;
2180 } 2180 }
2181 2181
2182 clear_bit(MEGASAS_FUSION_IN_RESET,
2183 &instance->reset_flags);
2182 instance->instancet->enable_intr(instance->reg_set); 2184 instance->instancet->enable_intr(instance->reg_set);
2183 instance->adprecovery = MEGASAS_HBA_OPERATIONAL; 2185 instance->adprecovery = MEGASAS_HBA_OPERATIONAL;
2184 2186
@@ -2240,6 +2242,7 @@ int megasas_reset_fusion(struct Scsi_Host *shost)
2240 megaraid_sas_kill_hba(instance); 2242 megaraid_sas_kill_hba(instance);
2241 retval = FAILED; 2243 retval = FAILED;
2242 } else { 2244 } else {
2245 clear_bit(MEGASAS_FUSION_IN_RESET, &instance->reset_flags);
2243 instance->instancet->enable_intr(instance->reg_set); 2246 instance->instancet->enable_intr(instance->reg_set);
2244 instance->adprecovery = MEGASAS_HBA_OPERATIONAL; 2247 instance->adprecovery = MEGASAS_HBA_OPERATIONAL;
2245 } 2248 }