Merge git://git.infradead.org/mtd-2.6

* git://git.infradead.org/mtd-2.6: (46 commits)
  [MTD] [MAPS] drivers/mtd/maps/ck804xrom.c: convert pci_module_init()
  [MTD] [NAND] CM-x270 MTD driver
  [MTD] [NAND] Wrong calculation of page number in nand_block_bad()
  [MTD] [MAPS] fix plat-ram printk format
  [JFFS2] Fix compr_rubin.c build after include file elimination.
  [JFFS2] Handle inodes with only a single metadata node with non-zero isize
  [JFFS2] Tidy up licensing/copyright boilerplate.
  [MTD] [OneNAND] Exit loop only when column start with 0
  [MTD] [OneNAND] Fix access the past of the real oobfree array
  [MTD] [OneNAND] Update Samsung OneNAND official URL
  [JFFS2] Better fix for all-zero node headers
  [JFFS2] Improve read_inode memory usage, v2.
  [JFFS2] Improve failure mode if inode checking leaves unchecked space.
  [JFFS2] Fix cross-endian build.
  [MTD] Finish conversion mtd_blkdevs to use the kthread API
  [JFFS2] Obsolete dirent nodes immediately on unlink, where possible.
  Use menuconfig objects: MTD
  [MTD] mtd_blkdevs: Convert to use the kthread API
  [MTD] Fix fwh_lock locking
  [JFFS2] Speed up mount for directly-mapped NOR flash
  ...

2 files changed, 20 insertions, 16 deletions

diff --git a/drivers/mtd/onenand/Kconfig b/drivers/mtd/onenand/Kconfig
index 373bddce8f1c..c257d397d08a 100644
--- a/drivers/mtd/onenand/Kconfig
+++ b/drivers/mtd/onenand/Kconfig
@@ -2,20 +2,18 @@
 # linux/drivers/mtd/onenand/Kconfig
 #
 
-menu "OneNAND Flash Device Drivers"
-        depends on MTD != n
-
-config MTD_ONENAND
+menuconfig MTD_ONENAND
         tristate "OneNAND Device Support"
         depends on MTD
         help
           This enables support for accessing all type of OneNAND flash
           devices. For further information see
-          <http://www.samsung.com/Products/Semiconductor/Flash/OneNAND_TM/index.htm>.
+          <http://www.samsung.com/Products/Semiconductor/OneNAND/index.htm>
+
+if MTD_ONENAND
 
 config MTD_ONENAND_VERIFY_WRITE
         bool "Verify OneNAND page writes"
-        depends on MTD_ONENAND
         help
           This adds an extra check when data is written to the flash. The
           OneNAND flash device internally checks only bits transitioning
@@ -25,13 +23,12 @@ config MTD_ONENAND_VERIFY_WRITE
 
 config MTD_ONENAND_GENERIC
         tristate "OneNAND Flash device via platform device driver"
-        depends on MTD_ONENAND && ARM
+        depends on ARM
         help
           Support for OneNAND flash via platform device driver.
 
 config MTD_ONENAND_OTP
         bool "OneNAND OTP Support"
-        depends on MTD_ONENAND
         help
           One Block of the NAND Flash Array memory is reserved as
           a One-Time Programmable Block memory area.
@@ -43,4 +40,4 @@ config MTD_ONENAND_OTP
 
           OTP block is fully-guaranteed to be a valid block.
 
-endmenu
+endif # MTD_ONENAND
diff --git a/drivers/mtd/onenand/onenand_base.c b/drivers/mtd/onenand/onenand_base.c
index 9e14a26ca4e8..000794c6caf5 100644
--- a/drivers/mtd/onenand/onenand_base.c
+++ b/drivers/mtd/onenand/onenand_base.c
@@ -836,9 +836,11 @@ static int onenand_transfer_auto_oob(struct mtd_info *mtd, uint8_t *buf, int col
         int readcol = column;
         int readend = column + thislen;
         int lastgap = 0;
+        unsigned int i;
         uint8_t *oob_buf = this->oob_buf;
 
-        for (free = this->ecclayout->oobfree; free->length; ++free) {
+        free = this->ecclayout->oobfree;
+        for (i = 0; i < MTD_MAX_OOBFREE_ENTRIES && free->length; i++, free++) {
                 if (readcol >= lastgap)
                         readcol += free->offset - lastgap;
                 if (readend >= lastgap)
@@ -846,7 +848,8 @@ static int onenand_transfer_auto_oob(struct mtd_info *mtd, uint8_t *buf, int col
                 lastgap = free->offset + free->length;
         }
         this->read_bufferram(mtd, ONENAND_SPARERAM, oob_buf, 0, mtd->oobsize);
-        for (free = this->ecclayout->oobfree; free->length; ++free) {
+        free = this->ecclayout->oobfree;
+        for (i = 0; i < MTD_MAX_OOBFREE_ENTRIES && free->length; i++, free++) {
                 int free_end = free->offset + free->length;
                 if (free->offset < readend && free_end > readcol) {
                         int st = max_t(int,free->offset,readcol);
@@ -854,7 +857,7 @@ static int onenand_transfer_auto_oob(struct mtd_info *mtd, uint8_t *buf, int col
                         int n = ed - st;
                         memcpy(buf, oob_buf + st, n);
                         buf += n;
-                } else
+                } else if (column == 0)
                         break;
         }
         return 0;
@@ -1280,15 +1283,18 @@ static int onenand_fill_auto_oob(struct mtd_info *mtd, u_char *oob_buf,
         int writecol = column;
         int writeend = column + thislen;
         int lastgap = 0;
+        unsigned int i;
 
-        for (free = this->ecclayout->oobfree; free->length; ++free) {
+        free = this->ecclayout->oobfree;
+        for (i = 0; i < MTD_MAX_OOBFREE_ENTRIES && free->length; i++, free++) {
                 if (writecol >= lastgap)
                         writecol += free->offset - lastgap;
                 if (writeend >= lastgap)
                         writeend += free->offset - lastgap;
                 lastgap = free->offset + free->length;
         }
-        for (free = this->ecclayout->oobfree; free->length; ++free) {
+        free = this->ecclayout->oobfree;
+        for (i = 0; i < MTD_MAX_OOBFREE_ENTRIES && free->length; i++, free++) {
                 int free_end = free->offset + free->length;
                 if (free->offset < writeend && free_end > writecol) {
                         int st = max_t(int,free->offset,writecol);
@@ -1296,7 +1302,7 @@ static int onenand_fill_auto_oob(struct mtd_info *mtd, u_char *oob_buf,
                         int n = ed - st;
                         memcpy(oob_buf + st, buf, n);
                         buf += n;
-                } else
+                } else if (column == 0)
                         break;
         }
         return 0;
@@ -2386,7 +2392,8 @@ int onenand_scan(struct mtd_info *mtd, int maxchips)
          * the out of band area
          */
         this->ecclayout->oobavail = 0;
-        for (i = 0; this->ecclayout->oobfree[i].length; i++)
+        for (i = 0; i < MTD_MAX_OOBFREE_ENTRIES &&
+            this->ecclayout->oobfree[i].length; i++)
                 this->ecclayout->oobavail +=
                         this->ecclayout->oobfree[i].length;
         mtd->oobavail = this->ecclayout->oobavail;