projects
/
platform
/
adaptation
/
renesas_rcar
/
renesas_kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi
[platform/adaptation/renesas_rcar/renesas_kernel.git]
/
drivers
/
scsi
/
scsi_error.c
diff --git
a/drivers/scsi/scsi_error.c
b/drivers/scsi/scsi_error.c
index
f43de1e
..
2150596
100644
(file)
--- a/
drivers/scsi/scsi_error.c
+++ b/
drivers/scsi/scsi_error.c
@@
-45,8
+45,6
@@
static void scsi_eh_done(struct scsi_cmnd *scmd);
static void scsi_eh_done(struct scsi_cmnd *scmd);
-#define SENSE_TIMEOUT (10*HZ)
-
/*
* These should *probably* be handled by the host itself.
* Since it is allowed to sleep, it probably should.
/*
* These should *probably* be handled by the host itself.
* Since it is allowed to sleep, it probably should.
@@
-538,7
+536,7
@@
static void scsi_eh_done(struct scsi_cmnd *scmd)
/**
* scsi_try_host_reset - ask host adapter to reset itself
/**
* scsi_try_host_reset - ask host adapter to reset itself
- * @scmd: SCSI cmd to send h
so
t reset.
+ * @scmd: SCSI cmd to send h
os
t reset.
*/
static int scsi_try_host_reset(struct scsi_cmnd *scmd)
{
*/
static int scsi_try_host_reset(struct scsi_cmnd *scmd)
{
@@
-881,7
+879,7
@@
retry:
*/
static int scsi_request_sense(struct scsi_cmnd *scmd)
{
*/
static int scsi_request_sense(struct scsi_cmnd *scmd)
{
- return scsi_send_eh_cmnd(scmd, NULL, 0,
SENSE_TIMEOUT
, ~0);
+ return scsi_send_eh_cmnd(scmd, NULL, 0,
scmd->device->eh_timeout
, ~0);
}
/**
}
/**
@@
-982,7
+980,8
@@
static int scsi_eh_tur(struct scsi_cmnd *scmd)
int retry_cnt = 1, rtn;
retry_tur:
int retry_cnt = 1, rtn;
retry_tur:
- rtn = scsi_send_eh_cmnd(scmd, tur_command, 6, SENSE_TIMEOUT, 0);
+ rtn = scsi_send_eh_cmnd(scmd, tur_command, 6,
+ scmd->device->eh_timeout, 0);
SCSI_LOG_ERROR_RECOVERY(3, printk("%s: scmd %p rtn %x\n",
__func__, scmd, rtn));
SCSI_LOG_ERROR_RECOVERY(3, printk("%s: scmd %p rtn %x\n",
__func__, scmd, rtn));