---

yaml --- r: 180689 b: refs/heads/master c: b857df1 h: refs/heads/master i: 180687: 776418a v: v3
git-mirror · Feb 18, 2010 · 1e8fdb5 · 1e8fdb5
1 parent 3b0832e
commit 1e8fdb5
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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);
 
 		/*