From 1e8fdb51196ef8f31bdcaaaa4e0a97439311e1a6 Mon Sep 17 00:00:00 2001 From: Guennadi Liakhovetski Date: Thu, 18 Feb 2010 18:07:18 +0100 Subject: [PATCH] --- yaml --- r: 180689 b: refs/heads/master c: b857df1acc634b18db1db2a40864af985100266e h: refs/heads/master i: 180687: 776418a98ab176674cf90e4662f22eb05e71102f v: v3 --- [refs] | 2 +- trunk/drivers/scsi/arm/fas216.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 07a42e93c6a9..4a7273554350 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6c09f09d44690d341d970559b64779bef8b9236b +refs/heads/master: b857df1acc634b18db1db2a40864af985100266e diff --git a/trunk/drivers/scsi/arm/fas216.c b/trunk/drivers/scsi/arm/fas216.c index 477542602284..9e71ac611146 100644 --- a/trunk/drivers/scsi/arm/fas216.c +++ b/trunk/drivers/scsi/arm/fas216.c @@ -2516,7 +2516,7 @@ int fas216_eh_device_reset(struct scsi_cmnd *SCpnt) if (info->scsi.phase == PHASE_IDLE) fas216_kick(info); - mod_timer(&info->eh_timer, 30 * HZ); + mod_timer(&info->eh_timer, jiffies + 30 * HZ); spin_unlock_irqrestore(&info->host_lock, flags); /*