From mboxrd@z Thu Jan 1 00:00:00 1970 From: Tejun Heo Subject: [PATCH 1/5] sata_sil24: fix timeout calculation in sil24_softreset Date: Fri, 7 Apr 2006 17:02:47 +0900 Message-ID: <11443969673236-git-send-email-htejun@gmail.com> References: <11443969673485-git-send-email-htejun@gmail.com> Reply-To: Tejun Heo Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7BIT Return-path: Received: from wproxy.gmail.com ([64.233.184.232]:28627 "EHLO wproxy.gmail.com") by vger.kernel.org with ESMTP id S932330AbWDGICx (ORCPT ); Fri, 7 Apr 2006 04:02:53 -0400 Received: by wproxy.gmail.com with SMTP id 37so323546wra for ; Fri, 07 Apr 2006 01:02:52 -0700 (PDT) In-Reply-To: <11443969673485-git-send-email-htejun@gmail.com> Sender: linux-ide-owner@vger.kernel.org List-Id: linux-ide@vger.kernel.org To: jgarzik@pobox.com, linux-ide@vger.kernel.org Cc: Tejun Heo 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 --- drivers/scsi/sata_sil24.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) d95c3c50429bdb09fadb3286128b7b0154116e80 diff --git a/drivers/scsi/sata_sil24.c b/drivers/scsi/sata_sil24.c index 60dd6f1..512ee6f 100644 --- a/drivers/scsi/sata_sil24.c +++ b/drivers/scsi/sata_sil24.c @@ -433,7 +433,7 @@ static int sil24_softreset(struct ata_po 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"); -- 1.2.4