diff options
Diffstat (limited to 'drivers/scsi/isci/request.c')
-rw-r--r-- | drivers/scsi/isci/request.c | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/drivers/scsi/isci/request.c b/drivers/scsi/isci/request.c index 6b0863e73f22..8039f1c72f72 100644 --- a/drivers/scsi/isci/request.c +++ b/drivers/scsi/isci/request.c | |||
@@ -836,7 +836,7 @@ static void isci_task_save_for_upper_layer_completion( | |||
836 | status); | 836 | status); |
837 | /* Add to the aborted list. */ | 837 | /* Add to the aborted list. */ |
838 | list_add(&request->completed_node, | 838 | list_add(&request->completed_node, |
839 | &host->requests_to_abort); | 839 | &host->requests_to_errorback); |
840 | break; | 840 | break; |
841 | 841 | ||
842 | default: | 842 | default: |
@@ -849,7 +849,7 @@ static void isci_task_save_for_upper_layer_completion( | |||
849 | 849 | ||
850 | /* Add to the aborted list. */ | 850 | /* Add to the aborted list. */ |
851 | list_add(&request->completed_node, | 851 | list_add(&request->completed_node, |
852 | &host->requests_to_abort); | 852 | &host->requests_to_errorback); |
853 | break; | 853 | break; |
854 | } | 854 | } |
855 | } | 855 | } |
@@ -1185,14 +1185,6 @@ void isci_request_io_request_complete( | |||
1185 | */ | 1185 | */ |
1186 | request->sci_request_handle = NULL; | 1186 | request->sci_request_handle = NULL; |
1187 | 1187 | ||
1188 | /* Only remove the request from the remote device list | ||
1189 | * of pending requests if we have not requested error | ||
1190 | * handling on this request. | ||
1191 | */ | ||
1192 | if (complete_to_host != isci_perform_error_io_completion) | ||
1193 | list_del_init(&request->dev_node); | ||
1194 | |||
1195 | |||
1196 | /* Save possible completion ptr. */ | 1188 | /* Save possible completion ptr. */ |
1197 | io_request_completion = request->io_request_completion; | 1189 | io_request_completion = request->io_request_completion; |
1198 | 1190 | ||