From: Huang Shijie <shijie8@gmail.com>
To: dwmw2@infradead.org
Cc: dedekind1@gmail.com, linux-mtd@lists.infradead.org,
linux-kernel@vger.kernel.org, Huang Shijie <shijie8@gmail.com>
Subject: [PATCH] mtd: fix the wrong timeo for panic_nand_wait()
Date: Mon, 21 Jan 2013 22:11:05 -0500 [thread overview]
Message-ID: <1358824265-3425-1-git-send-email-shijie8@gmail.com> (raw)
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 <shijie8@gmail.com>
---
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
next reply other threads:[~2013-01-21 14:08 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-01-22 3:11 Huang Shijie [this message]
2013-01-21 14:27 ` Matthieu CASTET
2013-01-21 14:54 ` Huang Shijie
2013-01-22 1:30 ` [PATCH v2] " Huang Shijie
2013-01-29 21:00 ` Florian Fainelli
2013-01-30 2:03 ` [PATCH v3] " Huang Shijie
2013-02-04 7:37 ` Artem Bityutskiy
2013-01-30 2:31 ` [PATCH v2] " Huang Shijie
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1358824265-3425-1-git-send-email-shijie8@gmail.com \
--to=shijie8@gmail.com \
--cc=dedekind1@gmail.com \
--cc=dwmw2@infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mtd@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
Powered by JetHome