diff options
Diffstat (limited to 'drivers/scsi/aacraid/linit.c')
| -rw-r--r-- | drivers/scsi/aacraid/linit.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/drivers/scsi/aacraid/linit.c b/drivers/scsi/aacraid/linit.c index 9dd331bc29b0..b4c9ff1b0859 100644 --- a/drivers/scsi/aacraid/linit.c +++ b/drivers/scsi/aacraid/linit.c | |||
| @@ -584,8 +584,11 @@ static int aac_eh_reset(struct scsi_cmnd* cmd) | |||
| 584 | * support a register, instead of a commanded, reset. | 584 | * support a register, instead of a commanded, reset. |
| 585 | */ | 585 | */ |
| 586 | if ((aac->supplement_adapter_info.SupportedOptions2 & | 586 | if ((aac->supplement_adapter_info.SupportedOptions2 & |
| 587 | le32_to_cpu(AAC_OPTION_MU_RESET|AAC_OPTION_IGNORE_RESET)) == | 587 | le32_to_cpu(AAC_OPTION_MU_RESET)) && |
| 588 | le32_to_cpu(AAC_OPTION_MU_RESET)) | 588 | aac_check_reset && |
| 589 | ((aac_check_reset != 1) || | ||
| 590 | (aac->supplement_adapter_info.SupportedOptions2 & | ||
| 591 | le32_to_cpu(AAC_OPTION_IGNORE_RESET)))) | ||
| 589 | aac_reset_adapter(aac, 2); /* Bypass wait for command quiesce */ | 592 | aac_reset_adapter(aac, 2); /* Bypass wait for command quiesce */ |
| 590 | return SUCCESS; /* Cause an immediate retry of the command with a ten second delay after successful tur */ | 593 | return SUCCESS; /* Cause an immediate retry of the command with a ten second delay after successful tur */ |
| 591 | } | 594 | } |