diff options
author | James Bottomley | 2005-08-05 23:31:35 +0200 |
---|---|---|
committer | James Bottomley | 2005-08-08 16:14:37 +0200 |
commit | 5262d0851cc6692390ee1aa2c55f57f3bfd0a7c7 (patch) | |
tree | 9acc17c71fd4e6387ea822564214b045858e716e /drivers/scsi/aacraid | |
parent | [SCSI] aic79xx: needs to select SPI_TRANSPORT_ATTRS (diff) | |
download | kernel-qcow2-linux-5262d0851cc6692390ee1aa2c55f57f3bfd0a7c7.tar.gz kernel-qcow2-linux-5262d0851cc6692390ee1aa2c55f57f3bfd0a7c7.tar.xz kernel-qcow2-linux-5262d0851cc6692390ee1aa2c55f57f3bfd0a7c7.zip |
[SCSI] aacraid: correct use of cmd->timeout field
The cmd->timeout field has been obsolete for a while now. While looking
to remove it, I came across this use in the aacraid driver. It looks
like you want to initialise the firmware with the current timeout of the
command (in seconds), so the value I think you should be using is
cmd->timeout_per_command.
Acked by: Mark Haverkamp <markh@osdl.org>
Acked by: Mark Salyzyn <mark_salyzyn@adaptec.com>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
Diffstat (limited to 'drivers/scsi/aacraid')
-rw-r--r-- | drivers/scsi/aacraid/aachba.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/scsi/aacraid/aachba.c b/drivers/scsi/aacraid/aachba.c index d6c999cd7f78..8e3493587299 100644 --- a/drivers/scsi/aacraid/aachba.c +++ b/drivers/scsi/aacraid/aachba.c @@ -1898,7 +1898,7 @@ static int aac_send_srb_fib(struct scsi_cmnd* scsicmd) srbcmd->id = cpu_to_le32(scsicmd->device->id); srbcmd->lun = cpu_to_le32(scsicmd->device->lun); srbcmd->flags = cpu_to_le32(flag); - timeout = (scsicmd->timeout-jiffies)/HZ; + timeout = scsicmd->timeout_per_command/HZ; if(timeout == 0){ timeout = 1; } |