git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
phylib: Fix delay argument of schedule_delayed_work
[safe/jmp/linux-2.6]
/
drivers
/
scsi
/
ncr53c8xx.c
diff --git
a/drivers/scsi/ncr53c8xx.c
b/drivers/scsi/ncr53c8xx.c
index
c57c94c
..
3b7240e
100644
(file)
--- a/
drivers/scsi/ncr53c8xx.c
+++ b/
drivers/scsi/ncr53c8xx.c
@@
-4170,8
+4170,8
@@
static int ncr_queue_command (struct ncb *np, struct scsi_cmnd *cmd)
**
**----------------------------------------------------
*/
**
**----------------------------------------------------
*/
- if (np->settle_time && cmd->
timeout_per_command
>= HZ) {
- u_long tlimit = jiffies + cmd->
timeout_per_command
- HZ;
+ if (np->settle_time && cmd->
request->timeout
>= HZ) {
+ u_long tlimit = jiffies + cmd->
request->timeout
- HZ;
if (time_after(np->settle_time, tlimit))
np->settle_time = tlimit;
}
if (time_after(np->settle_time, tlimit))
np->settle_time = tlimit;
}