From 20c246b0d47c0611364da7d2d6ad423a63edb30b Mon Sep 17 00:00:00 2001 From: adam radford Date: Sat, 8 Oct 2011 18:14:59 -0700 Subject: [PATCH] --- yaml --- r: 271126 b: refs/heads/master c: 3f0e58bc8ff80e173660bdfcc514d8a5c4419764 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/scsi/megaraid/megaraid_sas_fusion.c | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index a083b0e18e0d..5076f5e7144e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6497b2475df330437d462c770ee9af0a271d88f9 +refs/heads/master: 3f0e58bc8ff80e173660bdfcc514d8a5c4419764 diff --git a/trunk/drivers/scsi/megaraid/megaraid_sas_fusion.c b/trunk/drivers/scsi/megaraid/megaraid_sas_fusion.c index ec2e097f7737..120499ade9a5 100644 --- a/trunk/drivers/scsi/megaraid/megaraid_sas_fusion.c +++ b/trunk/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; }