From patchwork Mon Nov 5 13:51:51 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matthieu CASTET X-Patchwork-Id: 197202 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from merlin.infradead.org (merlin.infradead.org [IPv6:2001:4978:20e::2]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id ACA8A2C00A5 for ; Tue, 6 Nov 2012 01:19:32 +1100 (EST) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1TVNUe-00080m-0b; Mon, 05 Nov 2012 14:17:36 +0000 Received: from mail-bk0-f49.google.com ([209.85.214.49]) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1TVN5u-0008KS-0l for linux-mtd@lists.infradead.org; Mon, 05 Nov 2012 13:52:04 +0000 Received: by mail-bk0-f49.google.com with SMTP id j4so1936060bkw.36 for ; Mon, 05 Nov 2012 05:51:59 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:x-mailer; bh=9iLSXf0yZ00UgXsPUgtz4ZXVh6kKOFG3/wT0fhrgjSI=; b=Xkocbjri53587FEJKkuThzLZacSh413GNTo+2dwYTvJqSI4NydCcxN4SuMsKsTt9yc E1pPeGChv1GCUub1H9eQcXojHcf3LVZAl6eyRNCU055SN7kNhVUoYwNG3NViMnvt4x40 UkHPi09ziiZJzbnvT/mXUArl6uaylZfL5ITNZw2wR7DYaCcsWY1fRbtg3m2vYTODI7qt 0eNV5AVMReW4uQNizKJSeMA0v+m7iXTYBGcbbA8N+CWR6K99Zooqptei8WrpC+hQPnah zPTEV5gmJVeZvnr40AJL5BiIx+xxVY38FdxEy6uoqFzJZY0MKkP3LY0WtpvZtAyY1h9g FrZg== Received: by 10.204.157.145 with SMTP id b17mr2319537bkx.68.1352123519313; Mon, 05 Nov 2012 05:51:59 -0800 (PST) Received: from perruche.Parrot.Biz ([46.218.109.82]) by mx.google.com with ESMTPS id e13sm9780628bkw.12.2012.11.05.05.51.57 (version=SSLv3 cipher=OTHER); Mon, 05 Nov 2012 05:51:58 -0800 (PST) From: Matthieu CASTET To: linux-mtd@lists.infradead.org Subject: [PATCH] nand_wait_ready timeout fix Date: Mon, 5 Nov 2012 14:51:51 +0100 Message-Id: <1352123511-31538-1-git-send-email-matthieu.castet@parrot.com> X-Mailer: git-send-email 1.7.10.4 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20121105_085202_788894_A7422811 X-CRM114-Status: GOOD ( 11.35 ) X-Spam-Score: -2.6 (--) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-2.6 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [209.85.214.49 listed in list.dnswl.org] 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (matthieu.castet[at]gmail.com) -0.0 SPF_PASS SPF: sender matches SPF record -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature Cc: Matthieu CASTET , dedekind1@gmail.com X-BeenThere: linux-mtd@lists.infradead.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Linux MTD discussion mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: linux-mtd-bounces@lists.infradead.org Errors-To: linux-mtd-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org nand_wait_ready timeout should not assume HZ=1000. Make it independent of HZ value like it is done in nand_wait. Signed-off-by: Matthieu CASTET --- drivers/mtd/nand/nand_base.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/mtd/nand/nand_base.c b/drivers/mtd/nand/nand_base.c index d5ece6e..ee49fe2 100644 --- a/drivers/mtd/nand/nand_base.c +++ b/drivers/mtd/nand/nand_base.c @@ -492,7 +492,7 @@ static void panic_nand_wait_ready(struct mtd_info *mtd, unsigned long timeo) void nand_wait_ready(struct mtd_info *mtd) { struct nand_chip *chip = mtd->priv; - unsigned long timeo = jiffies + 2; + unsigned long timeo = jiffies + (2 * HZ) / 1000; /* 400ms timeout */ if (in_interrupt() || oops_in_progress)