[PATCH] sata_sil24: fix timeout calculation in sil24_softreset
authorTejun Heo <htejun@gmail.com>
Tue, 11 Apr 2006 13:22:29 +0000 (22:22 +0900)
committerJeff Garzik <jeff@garzik.org>
Tue, 11 Apr 2006 17:19:11 +0000 (13:19 -0400)
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>
drivers/scsi/sata_sil24.c

index a9506ad..24eed37 100644 (file)
@@ -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");