From 86eac3c2891f88482041ae47293ebd5e8275c92c Mon Sep 17 00:00:00 2001 From: Tejun Heo Date: Tue, 11 Apr 2006 22:22:29 +0900 Subject: [PATCH] --- yaml --- r: 29251 b: refs/heads/master c: 1c1d832cea1ab851a3f9b9d83245f5bc8b5b04b6 h: refs/heads/master i: 29249: 1a83b6d379ebe3ef376116b5fe45b62af9a8ec07 29247: cbd4c3d71a2c9fda46b91d7ac71a7173282dbc7d v: v3 --- [refs] | 2 +- trunk/drivers/scsi/sata_sil24.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 339130f55322..4e385b8fba6d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 987d2f05b396760517eef7cba66b2f415ac484f5 +refs/heads/master: 1c1d832cea1ab851a3f9b9d83245f5bc8b5b04b6 diff --git a/trunk/drivers/scsi/sata_sil24.c b/trunk/drivers/scsi/sata_sil24.c index a9506adadb6f..24eed37a063f 100644 --- a/trunk/drivers/scsi/sata_sil24.c +++ b/trunk/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");