mtd: nand: Allow caller to pass alternative ID table to nand_scan_ident()

[deliverable/linux.git] / drivers / mtd / nand / txx9ndfmc.c

diff --git a/drivers/mtd/nand/txx9ndfmc.c b/drivers/mtd/nand/txx9ndfmc.c
index 73af8324d0d0b4e540195063c9b311dcaf875b3b..054a41c0ef4afab8843811fea32b5fca428c7095 100644 (file)
--- a/drivers/mtd/nand/txx9ndfmc.c
+++ b/drivers/mtd/nand/txx9ndfmc.c
@@ -274,7 +274,7 @@ static int txx9ndfmc_nand_scan(struct mtd_info *mtd)
        struct nand_chip *chip = mtd->priv;
        int ret;
 
-       ret = nand_scan_ident(mtd, 1);
+       ret = nand_scan_ident(mtd, 1, NULL);
        if (!ret) {
                if (mtd->writesize >= 512) {
                        chip->ecc.size = mtd->writesize;
@@ -429,11 +429,10 @@ static int __exit txx9ndfmc_remove(struct platform_device *dev)
                chip = mtd->priv;
                txx9_priv = chip->priv;
 
+               nand_release(mtd);
 #ifdef CONFIG_MTD_PARTITIONS
-               del_mtd_partitions(mtd);
                kfree(drvdata->parts[i]);
 #endif
-               del_mtd_device(mtd);
                kfree(txx9_priv->mtdname);
                kfree(txx9_priv);
        }