]> git.proxmox.com Git - mirror_ubuntu-hirsute-kernel.git/commitdiff
[SCSI] megaraid_sas: Clear FUSION_IN_RESET before enabling interrupts
authoradam radford <aradford@gmail.com>
Sun, 9 Oct 2011 01:14:59 +0000 (18:14 -0700)
committerJames Bottomley <JBottomley@Parallels.com>
Sun, 16 Oct 2011 16:20:36 +0000 (11:20 -0500)
Signed-off-by: Adam Radford <aradford@gmail.com>
Signed-off-by: James Bottomley <JBottomley@Parallels.com>
drivers/scsi/megaraid/megaraid_sas_fusion.c

index ec2e097f773750f97b716c014c8fe2fd6a7b845b..120499ade9a598f407bd09cdf4e76541907d9912 100644 (file)
@@ -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;
        }