[PATCH] NAND: fsl_upm: fix build problem with 2.6.28-rc2

[Anton Vorontsov]

On Thu, Oct 30, 2008 at 11:44:50AM +0100, Wolfgang Grandegger wrote:
> 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.

This is becase of this commit:

commit 69fd3a8d098faf41a04930afa83757c0555ee360
Author: Sebastian Andrzej Siewior <bigeasy at linutronix.de>
Date:   Sun Oct 12 16:18:36 2008 +0200

    [MTD] remove unused mtd parameter in of_mtd_parse_partitions()


> Signed-off-by: Wolfgang Grandegger <wg at grandegger.com>

Acked-by: Anton Vorontsov <avorontsov at ru.mvista.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);

Thanks,

-- 
Anton Vorontsov
email: cbouatmailru at gmail.com
irc://irc.freenode.net/bd2