From: James Bottomley <James.Bottomley@HansenPartnership.com>
Date: Sun, 30 Nov 2008 16:38:08 +0000 (-0600)
Subject: [SCSI] stex: switch to block timeout
X-Git-Tag: v2.6.28-rc8~76^2
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=dc5c49bff34e5b5a4334560dc7f7dfeae91d8962;p=linux-2.6-omap-h63xx.git

[SCSI] stex: switch to block timeout

stex sets the timeout in its slave configure routine for all devices.
This now needs to update the request queue timeout in block.

Cc: Ed Lin <ed.lin@promise.com>
Signed-off-by: James Bottomley <James.Bottomley@HansenPartnership.com>
---

diff --git a/drivers/scsi/stex.c b/drivers/scsi/stex.c
index 3790906a77d..2fa830c0be2 100644
--- a/drivers/scsi/stex.c
+++ b/drivers/scsi/stex.c
@@ -477,7 +477,7 @@ stex_slave_config(struct scsi_device *sdev)
 {
 	sdev->use_10_for_rw = 1;
 	sdev->use_10_for_ms = 1;
-	sdev->timeout = 60 * HZ;
+	blk_queue_rq_timeout(sdev->request_queue, 60 * HZ);
 	sdev->tagged_supported = 1;
 
 	return 0;