X-Git-Url: http://git.samba.org/samba.git/?a=blobdiff_plain;f=drivers%2Fscsi%2Fstex.c;h=2fa830c0be2790187e17e43cf6dc0ffb35df1da8;hb=dc5c49bff34e5b5a4334560dc7f7dfeae91d8962;hp=f308a030882916aed13c1805ef9213758e1313eb;hpb=5f3b28781cbc030351e2fa0712602afbea592aae;p=sfrench%2Fcifs-2.6.git

diff --git a/drivers/scsi/stex.c b/drivers/scsi/stex.c
index f308a0308829..2fa830c0be27 100644
--- a/drivers/scsi/stex.c
+++ b/drivers/scsi/stex.c
@@ -467,7 +467,7 @@ stex_slave_alloc(struct scsi_device *sdev)
 	/* Cheat: usually extracted from Inquiry data */
 	sdev->tagged_supported = 1;
 
-	scsi_activate_tcq(sdev, sdev->host->can_queue);
+	scsi_activate_tcq(sdev, ST_CMD_PER_LUN);
 
 	return 0;
 }
@@ -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;