From: Wolfgang Grandegger <wg@grandegger.com>
To: linux-mtd@lists.infradead.org
Cc: linuxppc-dev@ozlabs.org,
Anton Vorontsov <avorontsov@ru.mvista.com>,
David Woodhouse <dwmw2@infradead.org>
Subject: [PATCH] NAND: fsl_upm: fix build problem with 2.6.28-rc2
Date: Thu, 30 Oct 2008 11:44:50 +0100 [thread overview]
Message-ID: <49099022.40908@grandegger.com> (raw)
This patch fixes a problem with building the 2.6.28-rc2 kernel with
FSL UPM NAND support for the TQM8548 modules. For some reason
of_mtd_parse_partitions() requires on argument less in the meantime.
Furthermore, the return value is checks properly.
Signed-off-by: Wolfgang Grandegger <wg@grandegger.com>
diff --git a/drivers/mtd/nand/fsl_upm.c b/drivers/mtd/nand/fsl_upm.c
index 024e3ff..a83192f 100644
--- a/drivers/mtd/nand/fsl_upm.c
+++ b/drivers/mtd/nand/fsl_upm.c
@@ -163,9 +163,11 @@ static int __devinit fun_chip_init(struct fsl_upm_nand *fun,
ret = parse_mtd_partitions(&fun->mtd, part_types, &fun->parts, 0);
#ifdef CONFIG_MTD_OF_PARTS
- if (ret == 0)
- ret = of_mtd_parse_partitions(fun->dev, &fun->mtd,
- flash_np, &fun->parts);
+ if (ret == 0) {
+ ret = of_mtd_parse_partitions(fun->dev, flash_np, &fun->parts);
+ if (ret < 0)
+ goto err;
+ }
#endif
if (ret > 0)
ret = add_mtd_partitions(&fun->mtd, fun->parts, ret);
WARNING: multiple messages have this Message-ID (diff)
From: Wolfgang Grandegger <wg@grandegger.com>
To: linux-mtd@lists.infradead.org
Cc: linuxppc-dev@ozlabs.org, David Woodhouse <dwmw2@infradead.org>
Subject: [PATCH] NAND: fsl_upm: fix build problem with 2.6.28-rc2
Date: Thu, 30 Oct 2008 11:44:50 +0100 [thread overview]
Message-ID: <49099022.40908@grandegger.com> (raw)
This patch fixes a problem with building the 2.6.28-rc2 kernel with
FSL UPM NAND support for the TQM8548 modules. For some reason
of_mtd_parse_partitions() requires on argument less in the meantime.
Furthermore, the return value is checks properly.
Signed-off-by: Wolfgang Grandegger <wg@grandegger.com>
diff --git a/drivers/mtd/nand/fsl_upm.c b/drivers/mtd/nand/fsl_upm.c
index 024e3ff..a83192f 100644
--- a/drivers/mtd/nand/fsl_upm.c
+++ b/drivers/mtd/nand/fsl_upm.c
@@ -163,9 +163,11 @@ static int __devinit fun_chip_init(struct fsl_upm_nand *fun,
ret = parse_mtd_partitions(&fun->mtd, part_types, &fun->parts, 0);
#ifdef CONFIG_MTD_OF_PARTS
- if (ret == 0)
- ret = of_mtd_parse_partitions(fun->dev, &fun->mtd,
- flash_np, &fun->parts);
+ if (ret == 0) {
+ ret = of_mtd_parse_partitions(fun->dev, flash_np, &fun->parts);
+ if (ret < 0)
+ goto err;
+ }
#endif
if (ret > 0)
ret = add_mtd_partitions(&fun->mtd, fun->parts, ret);
next reply other threads:[~2008-10-30 10:38 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-10-30 10:44 Wolfgang Grandegger [this message]
2008-10-30 10:44 ` [PATCH] NAND: fsl_upm: fix build problem with 2.6.28-rc2 Wolfgang Grandegger
2008-10-30 11:03 ` Anton Vorontsov
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=49099022.40908@grandegger.com \
--to=wg@grandegger.com \
--cc=avorontsov@ru.mvista.com \
--cc=dwmw2@infradead.org \
--cc=linux-mtd@lists.infradead.org \
--cc=linuxppc-dev@ozlabs.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.