From 5c98abc62475eb8a56854100c94e0e049bcecfaa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ilpo=20J=C3=A4rvinen?= <ilpo.jarvinen@helsinki.fi>
Date: Thu, 30 Oct 2008 13:00:57 +0200
Subject: [PATCH] --- yaml --- r: 124605 b: refs/heads/master c:
 4a8ab87baf8d424de99234fdfae35db6a414ffd2 h: refs/heads/master i:   124603:
 fd3d15f8aeb3fdddbc47960d39ebca0dfe74fa72 v: v3

---
 [refs]                          | 2 +-
 trunk/drivers/scsi/scsi_error.c | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 90d9f6d17883..372f8fc03fc6 100644
--- 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
index edfaf241c5ba..f5767dc48d61 100644
--- a/trunk/drivers/scsi/scsi_error.c
+++ b/trunk/drivers/scsi/scsi_error.c
@@ -136,7 +136,7 @@ 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:
@@ -144,6 +144,7 @@ enum blk_eh_timer_return scsi_times_out(struct request *req)
 		default:
 			return rtn;
 		}
+	}
 
 	if (unlikely(!scsi_eh_scmd_add(scmd, SCSI_EH_CANCEL_CMD))) {
 		scmd->result |= DID_TIME_OUT << 16;