From: Tejun Heo Date: Tue, 11 Apr 2006 13:22:29 +0000 (+0900) Subject: [PATCH] sata_sil24: fix timeout calculation in sil24_softreset X-Git-Tag: v2.6.18-rc1~1079^2~123 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=1c1d832cea1ab851a3f9b9d83245f5bc8b5b04b6;p=karo-tx-linux.git [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 Signed-off-by: Jeff Garzik --- diff --git a/drivers/scsi/sata_sil24.c b/drivers/scsi/sata_sil24.c index a9506adadb6f..24eed37a063f 100644 --- a/drivers/scsi/sata_sil24.c +++ b/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");