From: Guennadi Liakhovetski Date: Thu, 18 Feb 2010 17:07:18 +0000 (+0100) Subject: ARM: 5944/1: scsi: fix timer setup in fas216.c X-Git-Tag: v2.6.33~25^2~5 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=b857df1acc634b18db1db2a40864af985100266e;p=platform%2Fkernel%2Flinux-3.10.git ARM: 5944/1: scsi: fix timer setup in fas216.c mod_timer() takes an absolute time and not a delay as its argument. Cc: Signed-off-by: Guennadi Liakhovetski Signed-off-by: Russell King --- diff --git a/drivers/scsi/arm/fas216.c b/drivers/scsi/arm/fas216.c index 4775426..9e71ac6 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); /*