Move source tree closer to the 2.6.32.17 mainline
/drivers/scsi/arm/fas216.c
blob:477542602284661dbcb7d0d65d65223d612d3ec4 -> blob:9e71ac611146ab86432664af1c2a40c7d2070ea0
--- drivers/scsi/arm/fas216.c
+++ drivers/scsi/arm/fas216.c
@@ -2516,7 +2516,7 @@ int fas216_eh_device_reset(struct scsi_c
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);
/*