aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorTejun Heo <htejun@gmail.com>2006-04-11 09:22:29 -0400
committerJeff Garzik <jeff@garzik.org>2006-04-11 13:19:11 -0400
commit1c1d832cea1ab851a3f9b9d83245f5bc8b5b04b6 (patch)
treef74785a6acfd94b8fe4efdc39a8919f7f2e63e9c /drivers
parent987d2f05b396760517eef7cba66b2f415ac484f5 (diff)
[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>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/scsi/sata_sil24.c2
1 files changed, 1 insertions, 1 deletions
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)
432 struct sil24_port_priv *pp = ap->private_data; 432 struct sil24_port_priv *pp = ap->private_data;
433 struct sil24_prb *prb = &pp->cmd_block[0].ata.prb; 433 struct sil24_prb *prb = &pp->cmd_block[0].ata.prb;
434 dma_addr_t paddr = pp->cmd_block_dma; 434 dma_addr_t paddr = pp->cmd_block_dma;
435 unsigned long timeout = jiffies + ATA_TMOUT_BOOT * HZ; 435 unsigned long timeout = jiffies + ATA_TMOUT_BOOT;
436 u32 irq_enable, irq_stat; 436 u32 irq_enable, irq_stat;
437 437
438 DPRINTK("ENTER\n"); 438 DPRINTK("ENTER\n");