From 74b9e367e97bf3da32a9f6da7de9349c1755737c Mon Sep 17 00:00:00 2001
From: James Bottomley <James.Bottomley@HansenPartnership.com>
Date: Sun, 30 Nov 2008 10:32:26 -0600
Subject: [PATCH] --- yaml --- r: 119586 b: refs/heads/master c:
 9728c0814ecb505546696a659858fdb761375544 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 987ec7e477cd..b0acf276f1c1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ee1ab9e945803a607ba5c2a96b69e4820a806552
+refs/heads/master: 9728c0814ecb505546696a659858fdb761375544
diff --git a/trunk/drivers/scsi/scsi_error.c b/trunk/drivers/scsi/scsi_error.c
index 386361778ebb..edfaf241c5ba 100644
--- a/trunk/drivers/scsi/scsi_error.c
+++ b/trunk/drivers/scsi/scsi_error.c
@@ -932,8 +932,7 @@ static int scsi_eh_try_stu(struct scsi_cmnd *scmd)
 		int i, rtn = NEEDS_RETRY;
 
 		for (i = 0; rtn == NEEDS_RETRY && i < 2; i++)
-			rtn = scsi_send_eh_cmnd(scmd, stu_command, 6,
-						scmd->device->timeout, 0);
+			rtn = scsi_send_eh_cmnd(scmd, stu_command, 6, scmd->device->request_queue->rq_timeout, 0);
 
 		if (rtn == SUCCESS)
 			return 0;