---

yaml --- r: 29251 b: refs/heads/master c: 1c1d832 h: refs/heads/master i: 29249: 1a83b6d 29247: cbd4c3d v: v3
git-mirror · Apr 11, 2006 · 86eac3c · 86eac3c
1 parent 107094d
commit 86eac3c
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: 987d2f05b396760517eef7cba66b2f415ac484f5
+refs/heads/master: 1c1d832cea1ab851a3f9b9d83245f5bc8b5b04b6
diff --git a/trunk/drivers/scsi/sata_sil24.c b/trunk/drivers/scsi/sata_sil24.c
@@ -432,7 +432,7 @@ static int sil24_softreset(struct ata_port *ap, unsigned int *class)
 	struct sil24_port_priv *pp = ap->private_data;
 	struct sil24_prb *prb = &pp->cmd_block[0].ata.prb;
 	dma_addr_t paddr = pp->cmd_block_dma;
-	unsigned long timeout = jiffies + ATA_TMOUT_BOOT * HZ;
+	unsigned long timeout = jiffies + ATA_TMOUT_BOOT;
 	u32 irq_enable, irq_stat;
 
 	DPRINTK("ENTER\n");