diff options
author | Dan Williams <dan.j.williams@intel.com> | 2011-03-23 17:31:27 -0700 |
---|---|---|
committer | Dan Williams <dan.j.williams@intel.com> | 2011-07-03 03:55:30 -0700 |
commit | 9affa289e2f9ef4721e85edbde86466524bfe957 (patch) | |
tree | deb50d8e60b129c0f522240c1e2ad9da4c1f5954 /drivers/scsi/isci/core | |
parent | ce0b89f35636f3a69fbde851aff8a284c4b4c22b (diff) | |
download | op-kernel-dev-9affa289e2f9ef4721e85edbde86466524bfe957.zip op-kernel-dev-9affa289e2f9ef4721e85edbde86466524bfe957.tar.gz |
isci: reset hardware at init
Don't assume the hardware is in a known state at init.
Signed-off-by: Dan Williams <dan.j.williams@intel.com>
Diffstat (limited to 'drivers/scsi/isci/core')
-rw-r--r-- | drivers/scsi/isci/core/scic_sds_controller.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/scsi/isci/core/scic_sds_controller.c b/drivers/scsi/isci/core/scic_sds_controller.c index 180bb1e..799a04b 100644 --- a/drivers/scsi/isci/core/scic_sds_controller.c +++ b/drivers/scsi/isci/core/scic_sds_controller.c @@ -2116,7 +2116,7 @@ enum sci_status scic_controller_construct(struct scic_sds_controller *controller /* Initialize the User and OEM parameters to default values. */ scic_sds_controller_set_default_config_parameters(controller); - return SCI_SUCCESS; + return scic_controller_reset(controller); } /* --------------------------------------------------------------------------- */ @@ -3562,6 +3562,7 @@ const struct scic_sds_controller_state_handler scic_sds_controller_state_handler .terminate_request = scic_sds_controller_default_request_handler, }, [SCI_BASE_CONTROLLER_STATE_RESET] = { + .base.reset = scic_sds_controller_general_reset_handler, .base.initialize = scic_sds_controller_reset_state_initialize_handler, .base.start_io = scic_sds_controller_default_start_operation_handler, .base.complete_io = scic_sds_controller_default_request_handler, |