From 57cdc83e3d13b3bc592c0569bddd08a816274667 Mon Sep 17 00:00:00 2001 From: Dan Williams Date: Wed, 23 Mar 2011 17:31:27 -0700 Subject: [PATCH] --- yaml --- r: 254377 b: refs/heads/master c: 9affa289e2f9ef4721e85edbde86466524bfe957 h: refs/heads/master i: 254375: 2c7f1e80528ce1034e9233dda16edbb283132b34 v: v3 --- [refs] | 2 +- trunk/drivers/scsi/isci/core/scic_sds_controller.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index f58c4769ffd8..077377f78dab 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ce0b89f35636f3a69fbde851aff8a284c4b4c22b +refs/heads/master: 9affa289e2f9ef4721e85edbde86466524bfe957 diff --git a/trunk/drivers/scsi/isci/core/scic_sds_controller.c b/trunk/drivers/scsi/isci/core/scic_sds_controller.c index 180bb1e69012..799a04bc0938 100644 --- a/trunk/drivers/scsi/isci/core/scic_sds_controller.c +++ b/trunk/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,