diff options
| author |   Christof Schmitt <christof.schmitt@de.ibm.com> | 2007-03-28 14:20:40 +0200 |
|---|---|---|
| committer |   James Bottomley <jejb@mulgrave.il.steeleye.com> | 2007-04-01 10:27:58 -0500 |
| commit | 9e3738f3c83f534d82f1d7d5191dcecb2425f7f9 (patch) | |
| tree | 6d0ddc3f4ce2d9cee33c78100a7481bec038a394 /drivers/s390/scsi/zfcp_erp.c | |
| parent | [SCSI] qla2xxx: Remove duplicate pci_disable_device() call (diff) | |
| download | linux-dev-9e3738f3c83f534d82f1d7d5191dcecb2425f7f9.tar.xz linux-dev-9e3738f3c83f534d82f1d7d5191dcecb2425f7f9.zip | |
[SCSI] zfcp: fix initialization of FSF timer
Correctly initialize the timer for FSF requests with jiffies + timeout.
Cc: Swen Schillig <swen@vnet.ibm.com>
Acked-by: Heiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: Christof Schmitt <christof.schmitt@de.ibm.com>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
Diffstat (limited to 'drivers/s390/scsi/zfcp_erp.c')
| -rw-r--r-- | drivers/s390/scsi/zfcp_erp.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/s390/scsi/zfcp_erp.c b/drivers/s390/scsi/zfcp_erp.c index 421da1e7c0ea..c1f2d4b14c2b 100644 --- a/drivers/s390/scsi/zfcp_erp.c +++ b/drivers/s390/scsi/zfcp_erp.c @@ -186,7 +186,7 @@ void zfcp_fsf_start_timer(struct zfcp_fsf_req *fsf_req, unsigned long timeout) { fsf_req->timer.function = zfcp_fsf_request_timeout_handler; fsf_req->timer.data = (unsigned long) fsf_req->adapter; - fsf_req->timer.expires = timeout; + fsf_req->timer.expires = jiffies + timeout; add_timer(&fsf_req->timer); } |