diff options
| author | Tejun Heo <htejun@gmail.com> | 2006-04-11 22:22:29 +0900 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-04-11 13:19:11 -0400 |
| commit | 1c1d832cea1ab851a3f9b9d83245f5bc8b5b04b6 (patch) | |
| tree | f74785a6acfd94b8fe4efdc39a8919f7f2e63e9c /drivers/scsi/sata_sil24.c | |
| parent | 987d2f05b396760517eef7cba66b2f415ac484f5 (diff) | |
| download | linux-1c1d832cea1ab851a3f9b9d83245f5bc8b5b04b6.tar.gz linux-1c1d832cea1ab851a3f9b9d83245f5bc8b5b04b6.tar.bz2 linux-1c1d832cea1ab851a3f9b9d83245f5bc8b5b04b6.zip | |
[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/scsi/sata_sil24.c')
| -rw-r--r-- | drivers/scsi/sata_sil24.c | 2 |
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) 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"); |