---

yaml --- r: 37290 b: refs/heads/master c: 4fc383c h: refs/heads/master v: v3
git-mirror · Sep 17, 2006 · 04325a3 · 04325a3
1 parent cda5675
commit 04325a3
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1f427e8055b1ab408395d6da421d93783120484c
+refs/heads/master: 4fc383c09d14783ca7d7e97e2134abbe7dc43230
diff --git a/trunk/drivers/ieee1394/sbp2.c b/trunk/drivers/ieee1394/sbp2.c
@@ -802,11 +802,12 @@ static int sbp2_update(struct unit_directory *ud)
 	 */
 	sbp2scsi_complete_all_commands(scsi_id, DID_BUS_BUSY);
 
-	/* Make sure we unblock requests (since this is likely after a bus
-	 * reset). */
-	atomic_set(&scsi_id->unfinished_reset, 0);
-	scsi_unblock_requests(scsi_id->scsi_host);
-
+	/* Accept new commands unless there was another bus reset in the
+	 * meantime. */
+	if (hpsb_node_entry_valid(scsi_id->ne)) {
+		atomic_set(&scsi_id->unfinished_reset, 0);
+		scsi_unblock_requests(scsi_id->scsi_host);
+	}
 	return 0;
 }