summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-02-20 16:55:05 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2010-02-20 16:55:05 -0800
commitcf7ad04300f4ab0078e6bc41e305423ea159e8c4 (patch)
tree19f47c33c3e931580f090145d8c62bac2bde5c68 /drivers
parent4ec62b2b2e6bd7ddef7b6cea6e5db7b5578a6532 (diff)
parentd944d549aa86e08cba080396513234cf048fee1f (diff)
downloadlinux-cf7ad04300f4ab0078e6bc41e305423ea159e8c4.tar.bz2
Merge master.kernel.org:/home/rmk/linux-2.6-arm
* master.kernel.org:/home/rmk/linux-2.6-arm: ARM: allow alignment fault mode to be configured at kernel boot ARM: Update mach-types ARM: 5951/1: ARM: fix documentation of the PrimeCell bus ARM: 5950/1: ARM: Fix build error for arm1026ej-s processor MAINTAINERS: fix my e-mail and status for Gemini and FA526 Gemini: wrong registers used to set reg_level in gpio_set_irq_type() ARM: 5944/1: scsi: fix timer setup in fas216.c ARM: 5938/1: ARM: L2: export outer_cache_fns
Diffstat (limited to 'drivers')
-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);
/*