[PATCH] mtd: bcm963xx-flash: try JEDEC probe if CFI fails

[Florian Fainelli]

On Friday 29 October 2010 16:17:49 Guillaume LECERF wrote:
> Signed-off-by: Guillaume LECERF <glecerf at gmail.com>

Acked-by: Florian Fainelli <florian at openwrt.org>

> ---
>  drivers/mtd/maps/bcm963xx-flash.c |    5 +++++
>  1 files changed, 5 insertions(+), 0 deletions(-)
> 
> diff --git a/drivers/mtd/maps/bcm963xx-flash.c
> b/drivers/mtd/maps/bcm963xx-flash.c index d175c12..1f30495 100644
> --- a/drivers/mtd/maps/bcm963xx-flash.c
> +++ b/drivers/mtd/maps/bcm963xx-flash.c
> @@ -196,10 +196,15 @@ static int bcm963xx_probe(struct platform_device
> *pdev) bcm963xx_mtd_info = do_map_probe("cfi_probe", &bcm963xx_map);
>  	if (!bcm963xx_mtd_info) {
>  		dev_err(&pdev->dev, "failed to probe using CFI\n");
> +		bcm963xx_mtd_info = do_map_probe("jedec_probe", &bcm963xx_map);
> +		if (bcm963xx_mtd_info)
> +			goto probe_ok;
> +		dev_err(&pdev->dev, "failed to probe using JEDEC\n");
>  		err = -EIO;
>  		goto err_probe;
>  	}
> 
> +probe_ok:
>  	bcm963xx_mtd_info->owner = THIS_MODULE;
> 
>  	/* This is mutually exclusive */