mtd: omap: fix mtd devices not showing up

[Linux-MTD Mailing List]

Gitweb:     http://git.infradead.org/?p=mtd-2.6.git;a=commit;h=0c53b4e7e25a2635aef3006b990b6802cefc873f
Commit:     0c53b4e7e25a2635aef3006b990b6802cefc873f
Parent:     a5b7616c55e188fe3d6ef686bef402d4703ecb62
Author:     Frans Klaver <frans.klaver at xsens.com>
AuthorDate: Mon Oct 27 15:34:05 2014 +0100
Committer:  Brian Norris <computersforpeace at gmail.com>
CommitDate: Wed Oct 29 18:41:54 2014 -0700

    mtd: omap: fix mtd devices not showing up
    
    Since commit 6d178ef2fd5e ("mtd: nand: Move ELM driver and rename as
    omap_elm"), I don't have any mtd devices present on my am335x. This
    changes the link order of the omap_elm and omap2 objects, causing them
    to probe in the wrong order.
    
    To fix this, make elm_config defer probing until the omap_elm driver is
    actually loaded.
    
    Signed-off-by: Frans Klaver <frans.klaver at xsens.com>
    Acked-by: Roger Quadros <rogerq at ti.com>
    Signed-off-by: Brian Norris <computersforpeace at gmail.com>
---
 drivers/mtd/nand/omap_elm.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/mtd/nand/omap_elm.c b/drivers/mtd/nand/omap_elm.c
index b4f61c7..0585310 100644
--- a/drivers/mtd/nand/omap_elm.c
+++ b/drivers/mtd/nand/omap_elm.c
@@ -115,7 +115,7 @@ int elm_config(struct device *dev, enum bch_ecc bch_type,
 
 	if (!info) {
 		dev_err(dev, "Unable to configure elm - device not probed?\n");
-		return -ENODEV;
+		return -EPROBE_DEFER;
 	}
 	/* ELM cannot detect ECC errors for chunks > 1KB */
 	if (ecc_step_size > ((ELM_ECC_SIZE + 1) / 2)) {