Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5262d085 authored by James Bottomley's avatar James Bottomley Committed by James Bottomley
Browse files

[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: default avatarJames Bottomley <James.Bottomley@SteelEye.com>
parent a2ae85df

drivers/scsi/aacraid/aachba.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

	}