From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755330Ab3AUOIV (ORCPT ); Mon, 21 Jan 2013 09:08:21 -0500 Received: from mail-pa0-f42.google.com ([209.85.220.42]:61322 "EHLO mail-pa0-f42.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752635Ab3AUOIU (ORCPT ); Mon, 21 Jan 2013 09:08:20 -0500 From: Huang Shijie To: dwmw2@infradead.org Cc: dedekind1@gmail.com, linux-mtd@lists.infradead.org, linux-kernel@vger.kernel.org, Huang Shijie Subject: [PATCH] mtd: fix the wrong timeo for panic_nand_wait() Date: Mon, 21 Jan 2013 22:11:05 -0500 Message-Id: <1358824265-3425-1-git-send-email-shijie8@gmail.com> X-Mailer: git-send-email 1.7.4.4 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org In nand_wait(), the timeo for panic_nand_wait() is assigned with wrong value(jiffies + some delay). This patch fixes it, and also uses the msecs_to_jiffies() to make the code more readable. Signed-off-by: Huang Shijie --- drivers/mtd/nand/nand_base.c | 8 ++------ 1 files changed, 2 insertions(+), 6 deletions(-) diff --git a/drivers/mtd/nand/nand_base.c b/drivers/mtd/nand/nand_base.c index 8323ac9..acdd508 100644 --- a/drivers/mtd/nand/nand_base.c +++ b/drivers/mtd/nand/nand_base.c @@ -825,14 +825,9 @@ static void panic_nand_wait(struct mtd_info *mtd, struct nand_chip *chip, static int nand_wait(struct mtd_info *mtd, struct nand_chip *chip) { - unsigned long timeo = jiffies; + unsigned long timeo = (state == FL_ERASING) ? 400 : 20; int status, state = chip->state; - if (state == FL_ERASING) - timeo += (HZ * 400) / 1000; - else - timeo += (HZ * 20) / 1000; - led_trigger_event(nand_led_trigger, LED_FULL); /* @@ -849,6 +844,7 @@ static int nand_wait(struct mtd_info *mtd, struct nand_chip *chip) if (in_interrupt() || oops_in_progress) panic_nand_wait(mtd, chip, timeo); else { + timeo = jiffies + msecs_to_jiffies(timeo); while (time_before(jiffies, timeo)) { if (chip->dev_ready) { if (chip->dev_ready(mtd)) -- 1.7.4.4