diff options
author | Kashyap, Desai <kashyap.desai@lsi.com> | 2010-03-17 06:53:36 -0400 |
---|---|---|
committer | James Bottomley <James.Bottomley@suse.de> | 2010-04-11 10:23:57 -0400 |
commit | 6558bbb1457d2f33e233f9ed7bcf17fe96b93878 (patch) | |
tree | 004a74e35955e857420990782c9ea996246ba943 /drivers/scsi/mpt2sas/mpt2sas_base.c | |
parent | 89009fbb7d2df37536c8dc932fdead4189783f92 (diff) |
[SCSI] mpt2sas: Early return from function if shost is in recovery.
Aded checks for shost_recovery flag for early return from function.
Signed-off-by: Kashyap Desai <kashyap.desai@lsi.com>
Signed-off-by: James Bottomley <James.Bottomley@suse.de>
Diffstat (limited to 'drivers/scsi/mpt2sas/mpt2sas_base.c')
-rw-r--r-- | drivers/scsi/mpt2sas/mpt2sas_base.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/scsi/mpt2sas/mpt2sas_base.c b/drivers/scsi/mpt2sas/mpt2sas_base.c index 9ad4b48a9b62..b7b6285a3061 100644 --- a/drivers/scsi/mpt2sas/mpt2sas_base.c +++ b/drivers/scsi/mpt2sas/mpt2sas_base.c | |||
@@ -3521,7 +3521,9 @@ mpt2sas_base_free_resources(struct MPT2SAS_ADAPTER *ioc) | |||
3521 | __func__)); | 3521 | __func__)); |
3522 | 3522 | ||
3523 | _base_mask_interrupts(ioc); | 3523 | _base_mask_interrupts(ioc); |
3524 | ioc->shost_recovery = 1; | ||
3524 | _base_make_ioc_ready(ioc, CAN_SLEEP, SOFT_RESET); | 3525 | _base_make_ioc_ready(ioc, CAN_SLEEP, SOFT_RESET); |
3526 | ioc->shost_recovery = 0; | ||
3525 | if (ioc->pci_irq) { | 3527 | if (ioc->pci_irq) { |
3526 | synchronize_irq(pdev->irq); | 3528 | synchronize_irq(pdev->irq); |
3527 | free_irq(ioc->pci_irq, ioc); | 3529 | free_irq(ioc->pci_irq, ioc); |