From 5e6a74cdf5f1fff5b856a8a55681f8956ddb24fe Mon Sep 17 00:00:00 2001 From: Christof Schmitt Date: Wed, 28 Mar 2007 14:20:40 +0200 Subject: [PATCH] --- yaml --- r: 53676 b: refs/heads/master c: 9e3738f3c83f534d82f1d7d5191dcecb2425f7f9 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/s390/scsi/zfcp_erp.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 59fb8eec092e..f0061cccffdd 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 665db93b8a5fc6a11e2ace6b20569420a353d037 +refs/heads/master: 9e3738f3c83f534d82f1d7d5191dcecb2425f7f9 diff --git a/trunk/drivers/s390/scsi/zfcp_erp.c b/trunk/drivers/s390/scsi/zfcp_erp.c index 421da1e7c0ea..c1f2d4b14c2b 100644 --- a/trunk/drivers/s390/scsi/zfcp_erp.c +++ b/trunk/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); }