diff options
Diffstat (limited to 'drivers/mtd/maps/bcm963xx-flash.c')
-rw-r--r-- | 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 d175c120ee84..1f3049590d9e 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) | |||
196 | bcm963xx_mtd_info = do_map_probe("cfi_probe", &bcm963xx_map); | 196 | bcm963xx_mtd_info = do_map_probe("cfi_probe", &bcm963xx_map); |
197 | if (!bcm963xx_mtd_info) { | 197 | if (!bcm963xx_mtd_info) { |
198 | dev_err(&pdev->dev, "failed to probe using CFI\n"); | 198 | dev_err(&pdev->dev, "failed to probe using CFI\n"); |
199 | bcm963xx_mtd_info = do_map_probe("jedec_probe", &bcm963xx_map); | ||
200 | if (bcm963xx_mtd_info) | ||
201 | goto probe_ok; | ||
202 | dev_err(&pdev->dev, "failed to probe using JEDEC\n"); | ||
199 | err = -EIO; | 203 | err = -EIO; |
200 | goto err_probe; | 204 | goto err_probe; |
201 | } | 205 | } |
202 | 206 | ||
207 | probe_ok: | ||
203 | bcm963xx_mtd_info->owner = THIS_MODULE; | 208 | bcm963xx_mtd_info->owner = THIS_MODULE; |
204 | 209 | ||
205 | /* This is mutually exclusive */ | 210 | /* This is mutually exclusive */ |