summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMeelis Roos <mroos@linux.ee>2011-10-07 15:05:08 (GMT)
committerJames Bottomley <JBottomley@Parallels.com>2011-10-16 15:58:52 (GMT)
commit528c04ee6dcdb4591aab94a003e77e41cd7d2d23 (patch)
tree22ee60fe9cd19cde2b59dbccfe72277455864ac4
parentbf81973a5d907ca1226e295ef67f650b8f4e9b4c (diff)
downloadlinux-fsl-qoriq-528c04ee6dcdb4591aab94a003e77e41cd7d2d23.tar.xz
[SCSI] qlogicpti: fix timeout
qlogicpti times out for some tape library operations (like mtx inventory). It seems SCSI command timeout is hardcoded into the driver. Fix it by propagating the timeout from scsi request to the controller as suggested by James Bottomley. Tested on Sun Ultra 1 with Sun StorEdge L8 Autoloader. Signed-off-by: Meelis Roos <mroos@linux.ee> Acked-by: David S. Miller <davem@davemloft.net> Signed-off-by: James Bottomley <JBottomley@Parallels.com>
-rw-r--r--drivers/scsi/qlogicpti.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/scsi/qlogicpti.c b/drivers/scsi/qlogicpti.c
index 9689d41c..e40dc1c 100644
--- a/drivers/scsi/qlogicpti.c
+++ b/drivers/scsi/qlogicpti.c
@@ -880,7 +880,7 @@ static inline void cmd_frob(struct Command_Entry *cmd, struct scsi_cmnd *Cmnd,
cmd->control_flags |= CFLAG_WRITE;
else
cmd->control_flags |= CFLAG_READ;
- cmd->time_out = 30;
+ cmd->time_out = Cmnd->request->timeout/HZ;
memcpy(cmd->cdb, Cmnd->cmnd, Cmnd->cmd_len);
}