From: adam radford Date: Sun, 9 Oct 2011 01:14:59 +0000 (-0700) Subject: [SCSI] megaraid_sas: Clear FUSION_IN_RESET before enabling interrupts X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=3f0e58bc8ff80e173660bdfcc514d8a5c4419764;p=deliverable%2Flinux.git [SCSI] megaraid_sas: Clear FUSION_IN_RESET before enabling interrupts Signed-off-by: Adam Radford Signed-off-by: James Bottomley --- 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) 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 @@ int megasas_reset_fusion(struct Scsi_Host *shost) 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; }