summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGuennadi Liakhovetski <g.liakhovetski@gmx.de>2010-02-18 18:07:18 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2010-02-18 17:24:21 +0000
commitb857df1acc634b18db1db2a40864af985100266e (patch)
treeaeac72d20f30dc787488ddeddf1ea042b9a13cc7
parent6c09f09d44690d341d970559b64779bef8b9236b (diff)
downloadlinux-b857df1acc634b18db1db2a40864af985100266e.tar.gz
linux-b857df1acc634b18db1db2a40864af985100266e.tar.bz2
linux-b857df1acc634b18db1db2a40864af985100266e.zip
ARM: 5944/1: scsi: fix timer setup in fas216.c
mod_timer() takes an absolute time and not a delay as its argument. Cc: <stable@kernel.org> Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
-rw-r--r--drivers/scsi/arm/fas216.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/scsi/arm/fas216.c b/drivers/scsi/arm/fas216.c
index 477542602284..9e71ac611146 100644
--- a/drivers/scsi/arm/fas216.c
+++ b/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);
/*