From 3b9447a4274ec167355fa99043160acf0fd727c3 Mon Sep 17 00:00:00 2001 From: James Bottomley Date: Fri, 5 Aug 2005 16:31:35 -0500 Subject: [PATCH] --- yaml --- r: 7675 b: refs/heads/master c: 5262d0851cc6692390ee1aa2c55f57f3bfd0a7c7 h: refs/heads/master i: 7673: 13d07cdb15c3ce04ac24f0149b7a28d477fc80db 7671: 8f1df21578c58c46136eb8fb39110f7c3f2cf556 v: v3 --- [refs] | 2 +- trunk/drivers/scsi/aacraid/aachba.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 1aba5b727a3d..a9b23b80c8c1 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a2ae85df80a5b996a05d6d2ffc9bf97797e93ec6 +refs/heads/master: 5262d0851cc6692390ee1aa2c55f57f3bfd0a7c7 diff --git a/trunk/drivers/scsi/aacraid/aachba.c b/trunk/drivers/scsi/aacraid/aachba.c index d6c999cd7f78..8e3493587299 100644 --- a/trunk/drivers/scsi/aacraid/aachba.c +++ b/trunk/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; }