From: James Bottomley <James.Bottomley@SteelEye.com>



Signed-off-by: Andrew Morton <akpm@osdl.org>
---

 drivers/scsi/ibmvscsi/ibmvscsi.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

diff -puN drivers/scsi/ibmvscsi/ibmvscsi.c~git-scsi-misc-ibmvscsi-fix drivers/scsi/ibmvscsi/ibmvscsi.c
--- devel/drivers/scsi/ibmvscsi/ibmvscsi.c~git-scsi-misc-ibmvscsi-fix	2005-08-19 14:18:40.000000000 -0700
+++ devel-akpm/drivers/scsi/ibmvscsi/ibmvscsi.c	2005-08-19 14:18:40.000000000 -0700
@@ -594,7 +594,7 @@ static int ibmvscsi_queuecommand(struct 
 	init_event_struct(evt_struct,
 			  handle_cmd_rsp,
 			  VIOSRP_SRP_FORMAT,
-			  cmnd->timeout);
+			  cmnd->timeout_per_command);
 
 	evt_struct->cmnd = cmnd;
 	evt_struct->cmnd_done = done;
_