Merge tag 'v2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[mv-sheeva.git] / drivers / mtd / maps / bcm963xx-flash.c

diff --git a/drivers/mtd/maps/bcm963xx-flash.c b/drivers/mtd/maps/bcm963xx-flash.c
index d175c120ee845f6085b5e1e2b3d69d8b6cdc15af..1f3049590d9e0b80c6296c835c13b45224cb17dc 100644 (file)
--- 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 */