---

yaml --- r: 124605 b: refs/heads/master c: 4a8ab87 h: refs/heads/master i: 124603: fd3d15f v: v3
git-mirror · Dec 29, 2008 · 5c98abc · 5c98abc
1 parent c136a81
commit 5c98abc
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 66aa5745f6fe328f0166f91b523df864b17fb8f1
+refs/heads/master: 4a8ab87baf8d424de99234fdfae35db6a414ffd2
diff --git a/trunk/drivers/scsi/scsi_error.c b/trunk/drivers/scsi/scsi_error.c
@@ -136,14 +136,15 @@ enum blk_eh_timer_return scsi_times_out(struct request *req)
 	else
 		eh_timed_out = NULL;
 
-	if (eh_timed_out)
+	if (eh_timed_out) {
 		rtn = eh_timed_out(scmd);
 		switch (rtn) {
 		case BLK_EH_NOT_HANDLED:
 			break;
 		default:
 			return rtn;
 		}
+	}
 
 	if (unlikely(!scsi_eh_scmd_add(scmd, SCSI_EH_CANCEL_CMD))) {
 		scmd->result |= DID_TIME_OUT << 16;