summaryrefslogtreecommitdiff
path: root/fs
diff options
context:
space:
mode:
authorStephen Rothwell <sfr@canb.auug.org.au>2013-11-08 13:56:28 +1100
committerStephen Rothwell <sfr@canb.auug.org.au>2013-11-08 13:56:28 +1100
commitc3b52329bab28760b3e539a3554550ecfa018c44 (patch)
tree025a7ed202f1030358a3b09143541d1d63d40968 /fs
parent767e73d8c0129fe317bd118da4674839f79c767d (diff)
parentedaf4d4aad61134e820c0431cbe3d319794899f9 (diff)
Merge remote-tracking branch 'l2-mtd/master'
Diffstat (limited to 'fs')
-rw-r--r--fs/jffs2/fs.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/fs/jffs2/fs.c b/fs/jffs2/fs.c
index fe3c0527545f..09b3ed455724 100644
--- a/fs/jffs2/fs.c
+++ b/fs/jffs2/fs.c
@@ -515,6 +515,10 @@ int jffs2_do_fill_super(struct super_block *sb, void *data, int silent)
c = JFFS2_SB_INFO(sb);
+ /* Do not support the MLC nand */
+ if (c->mtd->type == MTD_MLCNANDFLASH)
+ return -EINVAL;
+
#ifndef CONFIG_JFFS2_FS_WRITEBUFFER
if (c->mtd->type == MTD_NANDFLASH) {
pr_err("Cannot operate on NAND flash unless jffs2 NAND support is compiled in\n");