Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1...

[firefly-linux-kernel-4.4.55.git] / drivers / mtd / mtdswap.c

diff --git a/drivers/mtd/mtdswap.c b/drivers/mtd/mtdswap.c
index fed215c4cfa19a3676666dbef17c1e4ce8b8d8bc..fd7885327611d75d68a25e788fa7a44950109513 100644 (file)
--- a/drivers/mtd/mtdswap.c
+++ b/drivers/mtd/mtdswap.c
@@ -1450,7 +1450,13 @@ static void mtdswap_add_mtd(struct mtd_blktrans_ops *tr, struct mtd_info *mtd)
        }
 
        oinfo = mtd->ecclayout;
-       if (!mtd->oobsize || !oinfo || oinfo->oobavail < MTDSWAP_OOBSIZE) {
+       if (!oinfo) {
+               printk(KERN_ERR "%s: mtd%d does not have OOB\n",
+                       MTDSWAP_PREFIX, mtd->index);
+               return;
+       }
+
+       if (!mtd->oobsize || oinfo->oobavail < MTDSWAP_OOBSIZE) {
                printk(KERN_ERR "%s: Not enough free bytes in OOB, "
                        "%d available, %zu needed.\n",
                        MTDSWAP_PREFIX, oinfo->oobavail, MTDSWAP_OOBSIZE);