---

yaml --- r: 43422 b: refs/heads/master c: 23077f1 h: refs/heads/master v: v3
git-mirror · Dec 7, 2006 · c6a46cf · c6a46cf
1 parent 3d9cf6c
commit c6a46cf
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 9 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0e930f437eab6db6de5e3f0efbf10dafffca401a
+refs/heads/master: 23077f1d72d279244536f11db51258fc4759c81a
diff --git a/trunk/drivers/ieee1394/sbp2.c b/trunk/drivers/ieee1394/sbp2.c
@@ -2564,11 +2564,9 @@ static int sbp2scsi_abort(struct scsi_cmnd *SCpnt)
 	scsi_print_command(SCpnt);
 
 	if (sbp2util_node_is_available(scsi_id)) {
+		sbp2_agent_reset(scsi_id, 1);
 
-		/*
-		 * Right now, just return any matching command structures
-		 * to the free pool.
-		 */
+		/* Return a matching command structure to the free pool. */
 		spin_lock_irqsave(&scsi_id->sbp2_command_orb_lock, flags);
 		command = sbp2util_find_command_for_SCpnt(scsi_id, SCpnt);
 		if (command) {
@@ -2589,10 +2587,6 @@ static int sbp2scsi_abort(struct scsi_cmnd *SCpnt)
 		}
 		spin_unlock_irqrestore(&scsi_id->sbp2_command_orb_lock, flags);
 
-		/*
-		 * Initiate a fetch agent reset.
-		 */
-		sbp2_agent_reset(scsi_id, 1);
 		sbp2scsi_complete_all_commands(scsi_id, DID_BUS_BUSY);
 	}