Only load name if read succeeds

[yaffs2.git] / yaffs_mtdif_single.c

diff --git a/yaffs_mtdif_single.c b/yaffs_mtdif_single.c
index e61699d6e85f4475a2ddf87630c7161d0daec1a7..c92d5fe34cb2572b04b3d615f9a31df0c6b43921 100644 (file)
--- a/yaffs_mtdif_single.c
+++ b/yaffs_mtdif_single.c
@@ -1,8 +1,7 @@
 /*
  * YAFFS: Yet Another Flash File System. A NAND-flash specific file system.
  *
- * Copyright (C) 2002-2011 Aleph One Ltd.
- *   for Toby Churchill Ltd and Brightstar Engineering
+ * Copyright (C) 2002-2018 Aleph One Ltd.
  *
  * Created by Charles Manning <charles@aleph1.co.uk>
  *
@@ -28,11 +27,6 @@
 #include "yaffs_linux.h"
 
 
-#if (LINUX_VERSION_CODE < KERNEL_VERSION(3, 2, 0))
-#define MTD_OPS_AUTO_OOB MTD_OOB_AUTO
-#endif
-
-
 int nandmtd_erase_block(struct yaffs_dev *dev, int block_no)
 {
        struct mtd_info *mtd = yaffs_dev_to_mtd(dev);
@@ -103,12 +97,6 @@ static int yaffs_mtd_read(struct yaffs_dev *dev, int nand_chunk,
        ops.datbuf = data;
        ops.oobbuf = oob;
 
-#if (MTD_VERSION_CODE < MTD_VERSION(2, 6, 20))
-       /* In MTD 2.6.18 to 2.6.19 nand_base.c:nand_do_read_oob() has a bug;
-        * help it out with ops.len = ops.ooblen when ops.datbuf == NULL.
-        */
-       ops.len = (ops.datbuf) ? ops.len : ops.ooblen;
-#endif
        /* Read page and oob using MTD.
         * Check status and determine ECC result.
         */