---

yaml --- r: 43446 b: refs/heads/master c: 0b88544 h: refs/heads/master v: v3
git-mirror · Dec 7, 2006 · 6285583 · 6285583
1 parent 68e1ac9
commit 6285583
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 12 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8c8009e69b31c60e875a348c1b032ed9543d1df6
+refs/heads/master: 0b885449ac6fab42cd6808c9ea8d6e456e0e65b7
diff --git a/trunk/drivers/ieee1394/sbp2.c b/trunk/drivers/ieee1394/sbp2.c
@@ -2483,17 +2483,6 @@ static void sbp2scsi_complete_command(struct scsi_id_instance_data *scsi_id,
 		return;
 	}
 
-	/*
-	 * If a bus reset is in progress and there was an error, don't
-	 * complete the command, just let it get retried at the end of the
-	 * bus reset.
-	 */
-	if (!hpsb_node_entry_valid(scsi_id->ne)
-	    && (scsi_status != SBP2_SCSI_STATUS_GOOD)) {
-		SBP2_ERR("Bus reset in progress - retry command later");
-		return;
-	}
-
 	/*
 	 * Switch on scsi status
 	 */