Merge remote-tracking branch 'korg_git/nand/next' into mtd/next

diff --cc drivers/mtd/nand/raw/meson_nand.c
index 4e6d1a6a19c72764921dbea4f99060b281e9a6e4,03218018333933ad952f389d9f4b1714ad7d38d7..829b76b303aae0bdbd7c435de15d16f62b55a974
--- 1/drivers/mtd/nand/raw/meson_nand.c
--- 2/drivers/mtd/nand/raw/meson_nand.c
+++ b/drivers/mtd/nand/raw/meson_nand.c
@@@ -1302,9 -1303,10 +1302,8 @@@ static void meson_nfc_nand_chip_cleanup
                meson_chip = list_first_entry(&nfc->chips,
                                              struct meson_nfc_nand_chip, node);
                mtd = nand_to_mtd(&meson_chip->nand);
 -              ret = mtd_device_unregister(mtd);
 -              if (ret)
 -                      return ret;
 +              WARN_ON(mtd_device_unregister(mtd));
  
-               meson_nfc_free_buffer(&meson_chip->nand);
                nand_cleanup(&meson_chip->nand);
                list_del(&meson_chip->node);
        }