summaryrefslogtreecommitdiff
path: root/drivers/scsi
diff options
context:
space:
mode:
authorDave C Boutcher <sleddog@us.ibm.com>2005-08-22 23:38:26 +0400
committerJames Bottomley <jejb@mulgrave.(none)>2005-08-28 20:14:11 +0400
commit8224bfa84d510630b40ea460b2bb380c91acb8ae (patch)
tree2bfb5eda755e307e6c96a587bb30a48714f3956a /drivers/scsi
parentde540a53f2f7b68a48c3021e5ab78ea49f6cf21c (diff)
downloadlinux-8224bfa84d510630b40ea460b2bb380c91acb8ae.tar.xz
[SCSI] ibmvscsi timeout fix
This patch fixes a long term borkenness in ibmvscsi where we were using the wrong timeout field from the scsi command (and using the wrong units.) Now broken by the fact that the scsi_cmnd timeout field is gone entirely. This only worked before because all the SCSI targets assumed that 0 was default. Signed-off-by: Dave Boutcher <boutcher@us.ibm.com> Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
Diffstat (limited to 'drivers/scsi')
-rw-r--r--drivers/scsi/ibmvscsi/ibmvscsi.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/scsi/ibmvscsi/ibmvscsi.c b/drivers/scsi/ibmvscsi/ibmvscsi.c
index 1ae800ae93d7..e3e6752c4104 100644
--- a/drivers/scsi/ibmvscsi/ibmvscsi.c
+++ b/drivers/scsi/ibmvscsi/ibmvscsi.c
@@ -594,7 +594,7 @@ static int ibmvscsi_queuecommand(struct scsi_cmnd *cmnd,
init_event_struct(evt_struct,
handle_cmd_rsp,
VIOSRP_SRP_FORMAT,
- cmnd->timeout);
+ cmnd->timeout_per_command/HZ);
evt_struct->cmnd = cmnd;
evt_struct->cmnd_done = done;