From patchwork Fri Jan 23 16:18:05 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Benjamin Krill X-Patchwork-Id: 20088 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from bombadil.infradead.org (bombadil.infradead.org [18.85.46.34]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id B3AC1DE10D for ; Sat, 24 Jan 2009 03:19:12 +1100 (EST) Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.69 #1 (Red Hat Linux)) id 1LQOjJ-000594-IO; Fri, 23 Jan 2009 16:18:01 +0000 Received: from cursor.subgra.de ([78.46.252.50]) by bombadil.infradead.org with esmtps (Exim 4.69 #1 (Red Hat Linux)) id 1LQOjE-00058c-RO for linux-mtd@lists.infradead.org; Fri, 23 Jan 2009 16:17:59 +0000 Received: from localhost (localhost.localdomain [127.0.0.1]) by cursor.subgra.de (Postfix) with ESMTP id 76E6316000D; Fri, 23 Jan 2009 17:14:34 +0100 (CET) X-Virus-Scanned: amavisd-new at cursor.subgra.de Received: from cursor.subgra.de ([127.0.0.1]) by localhost (cursor.subgra.de [127.0.0.1]) (amavisd-new, port 10024) with LMTP id yk9AzuQvdBnB; Fri, 23 Jan 2009 17:14:33 +0100 (CET) Received: from caupo.subgra.de (caupo.subgra.de [78.46.252.49]) by cursor.subgra.de (Postfix) with SMTP id 7F14816000A; Fri, 23 Jan 2009 17:14:32 +0100 (CET) Received: by caupo.subgra.de (sSMTP sendmail emulation); Fri, 23 Jan 2009 17:18:05 +0100 Date: Fri, 23 Jan 2009 17:18:05 +0100 From: Benjamin Krill To: linux-mtd@lists.infradead.org, dwg@au1.ibm.com, linuxppc-dev@ozlabs.org, vwool@ru.mvista.com Subject: [PATCH v2] Check name property to determine partition nodes. Message-ID: <20090123161805.GA2598@codiert.org> MIME-Version: 1.0 Content-Disposition: inline User-Agent: mutt-ng/devel-r804 (Linux) X-Spam-Score: 0.4 (/) X-Spam-Report: SpamAssassin version 3.2.5 on bombadil.infradead.org summary: Content analysis details: (0.4 points) pts rule name description ---- ---------------------- -------------------------------------------------- 0.4 SUBJECT_FUZZY_TION Attempt to obfuscate words in Subject: X-BeenThere: linux-mtd@lists.infradead.org X-Mailman-Version: 2.1.9 Precedence: list List-Id: Linux MTD discussion mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: linux-mtd-bounces@lists.infradead.org Errors-To: linux-mtd-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org SLOF has a further node which could not be evaluate by the current routine. The current routine returns because the node hasn't the required reg property. As fix this patch adds a check to determine the partition child nodes. If the node is not an partition the number of total partitions will be decreased and loop continue with the next nodes. Signed-off-by: Benjamin Krill --- drivers/mtd/ofpart.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/drivers/mtd/ofpart.c b/drivers/mtd/ofpart.c index 9e45b3f..3e164f0 100644 --- a/drivers/mtd/ofpart.c +++ b/drivers/mtd/ofpart.c @@ -46,6 +46,13 @@ int __devinit of_mtd_parse_partitions(struct device *dev, const u32 *reg; int len; + /* check if this is a partition node */ + partname = of_get_property(pp, "name", &len); + if (strcmp(partname, "partition") != 0) { + nr_parts--; + continue; + } + reg = of_get_property(pp, "reg", &len); if (!reg || (len != 2 * sizeof(u32))) { of_node_put(pp);