diff options
Diffstat (limited to 'drivers/scsi/isci/request.c')
-rw-r--r-- | drivers/scsi/isci/request.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/scsi/isci/request.c b/drivers/scsi/isci/request.c index 9594ab62702b..e3e3bcbd5a9f 100644 --- a/drivers/scsi/isci/request.c +++ b/drivers/scsi/isci/request.c | |||
@@ -2978,7 +2978,7 @@ static void sci_request_started_state_enter(struct sci_base_state_machine *sm) | |||
2978 | /* all unaccelerated request types (non ssp or ncq) handled with | 2978 | /* all unaccelerated request types (non ssp or ncq) handled with |
2979 | * substates | 2979 | * substates |
2980 | */ | 2980 | */ |
2981 | if (!task && dev->dev_type == SAS_END_DEV) { | 2981 | if (!task && dev->dev_type == SAS_END_DEVICE) { |
2982 | state = SCI_REQ_TASK_WAIT_TC_COMP; | 2982 | state = SCI_REQ_TASK_WAIT_TC_COMP; |
2983 | } else if (task && task->task_proto == SAS_PROTOCOL_SMP) { | 2983 | } else if (task && task->task_proto == SAS_PROTOCOL_SMP) { |
2984 | state = SCI_REQ_SMP_WAIT_RESP; | 2984 | state = SCI_REQ_SMP_WAIT_RESP; |
@@ -3101,7 +3101,7 @@ sci_io_request_construct(struct isci_host *ihost, | |||
3101 | if (idev->rnc.remote_node_index == SCIC_SDS_REMOTE_NODE_CONTEXT_INVALID_INDEX) | 3101 | if (idev->rnc.remote_node_index == SCIC_SDS_REMOTE_NODE_CONTEXT_INVALID_INDEX) |
3102 | return SCI_FAILURE_INVALID_REMOTE_DEVICE; | 3102 | return SCI_FAILURE_INVALID_REMOTE_DEVICE; |
3103 | 3103 | ||
3104 | if (dev->dev_type == SAS_END_DEV) | 3104 | if (dev->dev_type == SAS_END_DEVICE) |
3105 | /* pass */; | 3105 | /* pass */; |
3106 | else if (dev_is_sata(dev)) | 3106 | else if (dev_is_sata(dev)) |
3107 | memset(&ireq->stp.cmd, 0, sizeof(ireq->stp.cmd)); | 3107 | memset(&ireq->stp.cmd, 0, sizeof(ireq->stp.cmd)); |
@@ -3125,7 +3125,7 @@ enum sci_status sci_task_request_construct(struct isci_host *ihost, | |||
3125 | /* Build the common part of the request */ | 3125 | /* Build the common part of the request */ |
3126 | sci_general_request_construct(ihost, idev, ireq); | 3126 | sci_general_request_construct(ihost, idev, ireq); |
3127 | 3127 | ||
3128 | if (dev->dev_type == SAS_END_DEV || dev_is_sata(dev)) { | 3128 | if (dev->dev_type == SAS_END_DEVICE || dev_is_sata(dev)) { |
3129 | set_bit(IREQ_TMF, &ireq->flags); | 3129 | set_bit(IREQ_TMF, &ireq->flags); |
3130 | memset(ireq->tc, 0, sizeof(struct scu_task_context)); | 3130 | memset(ireq->tc, 0, sizeof(struct scu_task_context)); |
3131 | 3131 | ||