summaryrefslogtreecommitdiff
path: root/drivers/mtd
diff options
context:
space:
mode:
authorFrans Klaver <frans.klaver@xsens.com>2014-10-27 17:34:05 +0300
committerBrian Norris <computersforpeace@gmail.com>2014-10-30 04:41:54 +0300
commit0c53b4e7e25a2635aef3006b990b6802cefc873f (patch)
treec3e352b3c43717c71c48b107dfface8c2ba032f0 /drivers/mtd
parenta5b7616c55e188fe3d6ef686bef402d4703ecb62 (diff)
downloadlinux-0c53b4e7e25a2635aef3006b990b6802cefc873f.tar.xz
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@xsens.com> Acked-by: Roger Quadros <rogerq@ti.com> Signed-off-by: Brian Norris <computersforpeace@gmail.com>
Diffstat (limited to 'drivers/mtd')
-rw-r--r--drivers/mtd/nand/omap_elm.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/mtd/nand/omap_elm.c b/drivers/mtd/nand/omap_elm.c
index b4f61c7fc161..058531044ceb 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)) {