---

yaml --- r: 154045 b: refs/heads/master c: 47e7e89 h: refs/heads/master i: 154043: cedd87c v: v3
git-mirror · Jun 21, 2009 · 348b124 · 348b124
1 parent c1385e2
commit 348b124
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b5c6f77680f4ff1775838fcedfdd6026bf5ad777
+refs/heads/master: 47e7e89ed029780adf2cc0cf506fcd4c2d5ca1e2
diff --git a/trunk/drivers/scsi/scsi_transport_fc.c b/trunk/drivers/scsi/scsi_transport_fc.c
@@ -3480,7 +3480,10 @@ fc_bsg_job_timeout(struct request *req)
 	}
 
 	/* the blk_end_sync_io() doesn't check the error */
-	return BLK_EH_HANDLED;
+	if (done)
+		return BLK_EH_NOT_HANDLED;
+	else
+		return BLK_EH_HANDLED;
 }
 
 static int