Merge back cpufreq changes for v4.7.

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

diff --git a/fs/jffs2/wbuf.c b/fs/jffs2/wbuf.c
index 5a3da3f52908ff8f89ad0f8985e1fe22381bb2fe..b25d28a21212d25fa1674e0ebc56d2dceda4ec34 100644 (file)
--- a/fs/jffs2/wbuf.c
+++ b/fs/jffs2/wbuf.c
@@ -1183,22 +1183,20 @@ void jffs2_dirty_trigger(struct jffs2_sb_info *c)
 
 int jffs2_nand_flash_setup(struct jffs2_sb_info *c)
 {
-       struct nand_ecclayout *oinfo = c->mtd->ecclayout;
-
        if (!c->mtd->oobsize)
                return 0;
 
        /* Cleanmarker is out-of-band, so inline size zero */
        c->cleanmarker_size = 0;
 
-       if (!oinfo || oinfo->oobavail == 0) {
+       if (c->mtd->oobavail == 0) {
                pr_err("inconsistent device description\n");
                return -EINVAL;
        }
 
        jffs2_dbg(1, "using OOB on NAND\n");
 
-       c->oobavail = oinfo->oobavail;
+       c->oobavail = c->mtd->oobavail;
 
        /* Initialise write buffer */
        init_rwsem(&c->wbuf_sem);