---

yaml --- r: 43445 b: refs/heads/master c: 8c8009e h: refs/heads/master i: 43443: 62d4547 v: v3
git-mirror · Dec 7, 2006 · 68e1ac9 · 68e1ac9
1 parent 4629cd7
commit 68e1ac9
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 16 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ea42ea0f58aaa03e9cd245b124903e25629746e6
+refs/heads/master: 8c8009e69b31c60e875a348c1b032ed9543d1df6
diff --git a/trunk/drivers/ieee1394/sbp2.c b/trunk/drivers/ieee1394/sbp2.c
@@ -2545,21 +2545,6 @@ static void sbp2scsi_complete_command(struct scsi_id_instance_data *scsi_id,
 		SCpnt->result = DID_BUS_BUSY << 16;
 	}
 
-	/*
-	 * If a unit attention occurs, return busy status so it gets
-	 * retried... it could have happened because of a 1394 bus reset
-	 * or hot-plug...
-	 * XXX  DID_BUS_BUSY is actually a bad idea because it will defy
-	 * the scsi layer's retry logic.
-	 */
-#if 0
-	if ((scsi_status == SBP2_SCSI_STATUS_CHECK_CONDITION) &&
-	    (SCpnt->sense_buffer[2] == UNIT_ATTENTION)) {
-		SBP2_DEBUG("UNIT ATTENTION - return busy");
-		SCpnt->result = DID_BUS_BUSY << 16;
-	}
-#endif
-
 	/*
 	 * Tell scsi stack that we're done with this command
 	 */