diff options
author | adam radford <aradford@gmail.com> | 2011-10-08 18:14:59 -0700 |
---|---|---|
committer | James Bottomley <JBottomley@Parallels.com> | 2011-10-16 11:20:36 -0500 |
commit | 3f0e58bc8ff80e173660bdfcc514d8a5c4419764 (patch) | |
tree | a2d33c2269490dd6a16803118b567d2b56d6e4cf /drivers/scsi/megaraid | |
parent | 6497b2475df330437d462c770ee9af0a271d88f9 (diff) | |
download | op-kernel-dev-3f0e58bc8ff80e173660bdfcc514d8a5c4419764.zip op-kernel-dev-3f0e58bc8ff80e173660bdfcc514d8a5c4419764.tar.gz |
[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/megaraid')
-rw-r--r-- | drivers/scsi/megaraid/megaraid_sas_fusion.c | 3 |
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 ec2e097..120499a 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; } |