Commit 1c1d832c authored Apr 11, 2006 by Tejun Heo Committed by Jeff Garzik Apr 11, 2006

[PATCH] sata_sil24: fix timeout calculation in sil24_softreset



sil24_softreset calculated timeout by adding ATA_TMOUT_BOOT * HZ to
jiffies; however, as ATA_TMOUT_BOOT is already in jiffies, multiplying
by HZ makes the value way off.  Fix it.

Signed-off-by: Tejun Heo <htejun@gmail.com>
Signed-off-by: Jeff Garzik <jeff@garzik.org>

parent 987d2f05

drivers/scsi/sata_sil24.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -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");