Merge remote-tracking branch 'edac-amd/for-next'

[karo-tx-linux.git] / fs / jffs2 / fs.c

diff --git a/fs/jffs2/fs.c b/fs/jffs2/fs.c
index fe3c0527545f3b96d495f422a220339b0373e620..09b3ed45572475feb68b117fcf5b420a1a5e4d8f 100644 (file)
--- 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");