summaryrefslogtreecommitdiffstats
path: root/drivers/scsi/megaraid
diff options
context:
space:
mode:
authoradam radford <aradford@gmail.com>2011-02-24 20:57:04 -0800
committerJames Bottomley <James.Bottomley@suse.de>2011-02-28 12:01:41 -0600
commit1ac515ef3f2f7ab32498b0e4907933ff8b9b98c0 (patch)
tree209da848bed26c8a1e692f97249f4c3d3b89b3fd /drivers/scsi/megaraid
parentf86c5424b02717a9eb9b1049a67ff3e7e9e92edf (diff)
downloadblackbird-op-linux-1ac515ef3f2f7ab32498b0e4907933ff8b9b98c0.tar.gz
blackbird-op-linux-1ac515ef3f2f7ab32498b0e4907933ff8b9b98c0.zip
[SCSI] megaraid_sas: Fix fault state handling
The following patch for megaraid_sas fixes fault state handling in megasas_transition_to_ready(). Signed-off-by: Adam Radford <aradford@gmail.com> Signed-off-by: James Bottomley <James.Bottomley@suse.de>
Diffstat (limited to 'drivers/scsi/megaraid')
-rw-r--r--drivers/scsi/megaraid/megaraid_sas_base.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/scsi/megaraid/megaraid_sas_base.c b/drivers/scsi/megaraid/megaraid_sas_base.c
index 22ec9f049181..c9d82b56c6d7 100644
--- a/drivers/scsi/megaraid/megaraid_sas_base.c
+++ b/drivers/scsi/megaraid/megaraid_sas_base.c
@@ -2613,7 +2613,9 @@ megasas_transition_to_ready(struct megasas_instance* instance)
case MFI_STATE_FAULT:
printk(KERN_DEBUG "megasas: FW in FAULT state!!\n");
- return -ENODEV;
+ max_wait = MEGASAS_RESET_WAIT_TIME;
+ cur_state = MFI_STATE_FAULT;
+ break;
case MFI_STATE_WAIT_HANDSHAKE:
/*
OpenPOWER on IntegriCloud