Merge git://git.infradead.org/~dwmw2/mtd-2.6.23

* git://git.infradead.org/~dwmw2/mtd-2.6.23:
  [MTD] [NAND] nand_base.c: fix type of eccpos pointer
  [MTD] [NAND] at91_nand rdy_pin fix
  [MTD] [NAND] fix race in nand_base.c
  [MTD] [NAND] Fix refactoring of EDB7312 hwcontrol function.
  [MTD] Fix potential leak in rfd_ftl_add_mtd
  [JFFS2] Print correct node offset when complaining about broken data CRC
  [JFFS2] Fix suspend failure with JFFS2 GC thread.
  [JFFS2] Deletion dirents should be REF_NORMAL, not REF_PRISTINE.
  [JFFS2] Prevent oops after 'node added in wrong place' debug check

9 files changed, 45 insertions, 18 deletions

diff --git a/drivers/mtd/nand/at91_nand.c b/drivers/mtd/nand/at91_nand.c
index 512e999177f7..b2a5672df6e0 100644
--- a/drivers/mtd/nand/at91_nand.c
+++ b/drivers/mtd/nand/at91_nand.c
@@ -128,7 +128,10 @@ static int __init at91_nand_probe(struct platform_device *pdev)
         nand_chip->IO_ADDR_R = host->io_base;
         nand_chip->IO_ADDR_W = host->io_base;
         nand_chip->cmd_ctrl = at91_nand_cmd_ctrl;
-        nand_chip->dev_ready = at91_nand_device_ready;
+
+        if (host->board->rdy_pin)
+                nand_chip->dev_ready = at91_nand_device_ready;
+
         nand_chip->ecc.mode = NAND_ECC_SOFT;    /* enable ECC */
         nand_chip->chip_delay = 20;             /* 20us command delay time */
 
diff --git a/drivers/mtd/nand/edb7312.c b/drivers/mtd/nand/edb7312.c
index 1daf8231aaef..0146cdc48039 100644
--- a/drivers/mtd/nand/edb7312.c
+++ b/drivers/mtd/nand/edb7312.c
@@ -74,7 +74,7 @@ static struct mtd_partition partition_info[] = {
 /*
  *      hardware specific access to control-lines
  *
- *      NAND_NCE: bit 0 -> bit 7
+ *      NAND_NCE: bit 0 -> bit 6 (bit 7 = 1)
  *      NAND_CLE: bit 1 -> bit 4
  *      NAND_ALE: bit 2 -> bit 5
  */
@@ -83,12 +83,12 @@ static void ep7312_hwcontrol(struct mtd_info *mtd, int cmd, unsigned int ctrl)
         struct nand_chip *chip = mtd->priv;
 
         if (ctrl & NAND_CTRL_CHANGE) {
-                unsigned char bits;
+                unsigned char bits = 0x80;
 
-                bits = (ctrl & (NAND_CLE | NAND_ALE)) << 3;
-                bits = (ctrl & NAND_NCE) << 7;
+                bits |= (ctrl & (NAND_CLE | NAND_ALE)) << 3;
+                bits |= (ctrl & NAND_NCE) ? 0x00 : 0x40;
 
-                clps_writeb((clps_readb(ep7312_pxdr)  & 0xB0) | 0x10,
+                clps_writeb((clps_readb(ep7312_pxdr)  & 0xF0) | bits,
                             ep7312_pxdr);
         }
         if (cmd != NAND_CMD_NONE)
diff --git a/drivers/mtd/nand/nand_base.c b/drivers/mtd/nand/nand_base.c
index 7e68203fe1ba..24ac6778b1a8 100644
--- a/drivers/mtd/nand/nand_base.c
+++ b/drivers/mtd/nand/nand_base.c
@@ -24,6 +24,7 @@
  *      if we have HW ecc support.
  *      The AG-AND chips have nice features for speed improvement,
  *      which are not supported yet. Read / program 4 pages in one go.
+ *      BBT table is not serialized, has to be fixed
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as
@@ -360,6 +361,7 @@ static int nand_default_block_markbad(struct mtd_info *mtd, loff_t ofs)
                 /* We write two bytes, so we dont have to mess with 16 bit
                  * access
                  */
+                nand_get_device(chip, mtd, FL_WRITING);
                 ofs += mtd->oobsize;
                 chip->ops.len = chip->ops.ooblen = 2;
                 chip->ops.datbuf = NULL;
@@ -367,9 +369,11 @@ static int nand_default_block_markbad(struct mtd_info *mtd, loff_t ofs)
                 chip->ops.ooboffs = chip->badblockpos & ~0x01;
 
                 ret = nand_do_write_oob(mtd, ofs, &chip->ops);
+                nand_release_device(mtd);
         }
         if (!ret)
                 mtd->ecc_stats.badblocks++;
+
         return ret;
 }
 
@@ -768,7 +772,7 @@ static int nand_read_page_swecc(struct mtd_info *mtd, struct nand_chip *chip,
         uint8_t *p = buf;
         uint8_t *ecc_calc = chip->buffers->ecccalc;
         uint8_t *ecc_code = chip->buffers->ecccode;
-        int *eccpos = chip->ecc.layout->eccpos;
+        uint32_t *eccpos = chip->ecc.layout->eccpos;
 
         chip->ecc.read_page_raw(mtd, chip, buf);
 
@@ -810,7 +814,7 @@ static int nand_read_page_hwecc(struct mtd_info *mtd, struct nand_chip *chip,
         uint8_t *p = buf;
         uint8_t *ecc_calc = chip->buffers->ecccalc;
         uint8_t *ecc_code = chip->buffers->ecccode;
-        int *eccpos = chip->ecc.layout->eccpos;
+        uint32_t *eccpos = chip->ecc.layout->eccpos;
 
         for (i = 0; eccsteps; eccsteps--, i += eccbytes, p += eccsize) {
                 chip->ecc.hwctl(mtd, NAND_ECC_READ);
@@ -1416,7 +1420,7 @@ static void nand_write_page_swecc(struct mtd_info *mtd, struct nand_chip *chip,
         int eccsteps = chip->ecc.steps;
         uint8_t *ecc_calc = chip->buffers->ecccalc;
         const uint8_t *p = buf;
-        int *eccpos = chip->ecc.layout->eccpos;
+        uint32_t *eccpos = chip->ecc.layout->eccpos;
 
         /* Software ecc calculation */
         for (i = 0; eccsteps; eccsteps--, i += eccbytes, p += eccsize)
@@ -1442,7 +1446,7 @@ static void nand_write_page_hwecc(struct mtd_info *mtd, struct nand_chip *chip,
         int eccsteps = chip->ecc.steps;
         uint8_t *ecc_calc = chip->buffers->ecccalc;
         const uint8_t *p = buf;
-        int *eccpos = chip->ecc.layout->eccpos;
+        uint32_t *eccpos = chip->ecc.layout->eccpos;
 
         for (i = 0; eccsteps; eccsteps--, i += eccbytes, p += eccsize) {
                 chip->ecc.hwctl(mtd, NAND_ECC_WRITE);
diff --git a/drivers/mtd/rfd_ftl.c b/drivers/mtd/rfd_ftl.c
index d4b1ba8f23ef..006c03aacb55 100644
--- a/drivers/mtd/rfd_ftl.c
+++ b/drivers/mtd/rfd_ftl.c
@@ -779,6 +779,7 @@ static void rfd_ftl_add_mtd(struct mtd_blktrans_ops *tr, struct mtd_info *mtd)
         else {
                 if (!mtd->erasesize) {
                         printk(KERN_WARNING PREFIX "please provide block_size");
+                        kfree(part);
                         return;
                 }
                 else
diff --git a/fs/jffs2/background.c b/fs/jffs2/background.c
index 143c5530caf3..504643f2e98b 100644
--- a/fs/jffs2/background.c
+++ b/fs/jffs2/background.c
@@ -84,7 +84,7 @@ static int jffs2_garbage_collect_thread(void *_c)
         set_freezable();
         for (;;) {
                 allow_signal(SIGHUP);
-
+        again:
                 if (!jffs2_thread_should_wake(c)) {
                         set_current_state (TASK_INTERRUPTIBLE);
                         D1(printk(KERN_DEBUG "jffs2_garbage_collect_thread sleeping...\n"));
@@ -95,9 +95,6 @@ static int jffs2_garbage_collect_thread(void *_c)
                         schedule();
                 }
 
-                if (try_to_freeze())
-                        continue;
-
                 /* This thread is purely an optimisation. But if it runs when
                    other things could be running, it actually makes things a
                    lot worse. Use yield() and put it at the back of the runqueue
@@ -112,6 +109,9 @@ static int jffs2_garbage_collect_thread(void *_c)