Skip to content

Commit

Permalink
mtd: bcm963xx-flash: try JEDEC probe if CFI fails
Browse files Browse the repository at this point in the history 
Signed-off-by: Guillaume LECERF <glecerf@gmail.com>
Acked-by: Florian Fainelli <florian@openwrt.org>
Signed-off-by: Artem Bityutskiy <Artem.Bityutskiy@nokia.com>
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
  • Loading branch information
Guillaume LECERF authored and David Woodhouse committed Dec 3, 2010
1 parent 7934650 commit 3345cc4
Showing 1 changed file with 5 additions and 0 deletions.
5 changes: 5 additions & 0 deletions drivers/mtd/maps/bcm963xx-flash.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
Expand Down

0 comments on commit 3345cc4

Please sign in to comment.