mtd: bcm963xx-flash: try JEDEC probe if CFI fails
PATCH 1/1 mtd: bcm963xx-flash: try JEDEC probe if CFI fails
Signed-off-by Guillaume LECERF <[email protected]>
--- drivers/mtd/maps/bcm963xx-flash.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-)
drivers/mtd/maps/bcm963xx-flash.c +5 -0
@@ -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 */
Quoted 1 line · On Friday 29 October 2010 16:17:49 Guillaume LECERF wrote:
Signed-off-by Guillaume LECERF <[email protected]>
Acked-by Florian Fainelli <[email protected]>
Quoted 24 lines
--- drivers/mtd/maps/bcm963xx-flash.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-)(quoted diff) +0
-0
b/drivers/mtd/maps/bcm963xx-flash.cindex d175c12..1f30495 100644drivers/mtd/maps/bcm963xx-flash.c +5
-0@@ -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 */
Artem Bityutskiy
AppliedQuoted 4 lines · Guillaume LECERF
Signed-off-by Guillaume LECERF <[email protected]>--- drivers/mtd/maps/bcm963xx-flash.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-)
Pushed to l2-mtd-2.6.git, thanks you.
Signature · 2 lines
Best Regards, Artem Bityutskiy (Артём Битюцкий)