---

yaml --- r: 254441 b: refs/heads/master c: f619fff h: refs/heads/master i: 254439: 84d8bfd v: v3
git-mirror · Jul 3, 2011 · 633b774 · 633b774
1 parent 03b9430
commit 633b774
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 7 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8f304c36ee415600c6bbc5de300e6fa3dbe59d6d
+refs/heads/master: f619fffb4070a577524fd9eb68cea484d86d2b97
diff --git a/trunk/drivers/scsi/isci/remote_device.c b/trunk/drivers/scsi/isci/remote_device.c
@@ -1157,10 +1157,8 @@ static enum sci_status scic_sds_stp_remote_device_ready_ncq_substate_start_io_ha
 			return status;
 
 		status = scic_sds_remote_node_context_start_io(&sci_dev->rnc, request);
-		if (status != SCI_SUCCESS)
-			return status;
-
-		status = request->state_handlers->start_handler(request);
+		if (status == SCI_SUCCESS)
+			status = request->state_handlers->start_handler(request);
 
 		scic_sds_remote_device_start_request(sci_dev, request, status);
 	} else
@@ -1302,16 +1300,17 @@ static enum sci_status scic_sds_smp_remote_device_ready_idle_substate_start_io_h
 
 	status = scic_sds_remote_node_context_start_io(&sci_dev->rnc, sci_req);
 	if (status != SCI_SUCCESS)
-		return status;
+		goto out;
 
 	status = scic_sds_request_start(sci_req);
 	if (status != SCI_SUCCESS)
-		return status;
+		goto out;
 
 	sci_dev->working_request = sci_req;
 	sci_base_state_machine_change_state(&sci_dev->state_machine,
 					    SCIC_SDS_SMP_REMOTE_DEVICE_READY_SUBSTATE_CMD);
 
+ out:
 	scic_sds_remote_device_start_request(sci_dev, sci_req, status);
 
 	return status;