Patchwork mtd/fsmc_nand: fix build error

login
register
mail settings
Submitter Linus Walleij
Date July 18, 2011, 10:55 a.m.
Message ID <1310986539-458-1-git-send-email-linus.walleij@linaro.org>
Download mbox | patch
Permalink /patch/105246/
State New
Headers show

Comments

Linus Walleij - July 18, 2011, 10:55 a.m.
Recent -next does not build due to malformed code, so just fix it.

Cc: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
---
Dmitry can you check that I fixed this the right way?
---
 drivers/mtd/nand/fsmc_nand.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
Artem Bityutskiy - July 20, 2011, 5:01 a.m.
On Mon, 2011-07-18 at 12:55 +0200, Linus Walleij wrote:
> Recent -next does not build due to malformed code, so just fix it.
> 
> Cc: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
> ---
> Dmitry can you check that I fixed this the right way?
> ---
>  drivers/mtd/nand/fsmc_nand.c |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)

Thanks, instead of taking this patch I've folded it in Dmitry's
"mtd: fsmc_nand.c: use mtd_device_parse_register" patch to make sure
upstream is bisectable. I've added your name to the commit message.

Pushed to l2-mtd-2.6.git, thanks!

FYI: my l2-mtd-2.6.git is visible in -next now, so you should see
the fix there soon.

Patch

diff --git a/drivers/mtd/nand/fsmc_nand.c b/drivers/mtd/nand/fsmc_nand.c
index 8cc8065..e53b760 100644
--- a/drivers/mtd/nand/fsmc_nand.c
+++ b/drivers/mtd/nand/fsmc_nand.c
@@ -719,7 +719,7 @@  static int __init fsmc_nand_probe(struct platform_device *pdev)
 				partition_info_128KB_blk,
 			host->mtd.size <= 0x04000000 ?
 				ARRAY_SIZE(partition_info_16KB_blk) :
-				ARRAY_SIZE(partition_info_128KB_blk),
+				ARRAY_SIZE(partition_info_128KB_blk));
 	if (ret)
 		goto err_probe;