diff --git a/[refs] b/[refs]
index b0acf276f1c1..f588dfbc407e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9728c0814ecb505546696a659858fdb761375544
+refs/heads/master: dc5c49bff34e5b5a4334560dc7f7dfeae91d8962
diff --git a/trunk/drivers/scsi/stex.c b/trunk/drivers/scsi/stex.c
index 3790906a77d1..2fa830c0be27 100644
--- a/trunk/drivers/scsi/stex.c
+++ b/trunk/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;