diff options
| author | Paul Mackerras <paulus@samba.org> | 2007-05-07 23:37:51 -0400 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2007-05-07 23:37:51 -0400 |
| commit | 02bbc0f09c90cefdb2837605c96a66c5ce4ba2e1 (patch) | |
| tree | 04ef573cd4de095c500c9fc3477f4278c0b36300 /drivers/s390/scsi/zfcp_erp.c | |
| parent | 7487a2245b8841c77ba9db406cf99a483b9334e9 (diff) | |
| parent | 5b94f675f57e4ff16c8fda09088d7480a84dcd91 (diff) | |
Merge branch 'linux-2.6'
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) | |||
| 186 | { | 186 | { |
| 187 | fsf_req->timer.function = zfcp_fsf_request_timeout_handler; | 187 | fsf_req->timer.function = zfcp_fsf_request_timeout_handler; |
| 188 | fsf_req->timer.data = (unsigned long) fsf_req->adapter; | 188 | fsf_req->timer.data = (unsigned long) fsf_req->adapter; |
| 189 | fsf_req->timer.expires = timeout; | 189 | fsf_req->timer.expires = jiffies + timeout; |
| 190 | add_timer(&fsf_req->timer); | 190 | add_timer(&fsf_req->timer); |
| 191 | } | 191 | } |
| 192 | 192 | ||