static void ingenic_nand_cleanup_chips(struct ingenic_nfc *nfc)
 {
-       struct ingenic_nand *chip;
+       struct ingenic_nand *ingenic_chip;
+       struct nand_chip *chip;
+       int ret;
 
        while (!list_empty(&nfc->chips)) {
-               chip = list_first_entry(&nfc->chips,
-                                       struct ingenic_nand, chip_list);
-               nand_release(&chip->chip);
-               list_del(&chip->chip_list);
+               ingenic_chip = list_first_entry(&nfc->chips,
+                                               struct ingenic_nand, chip_list);
+               chip = &ingenic_chip->chip;
+               ret = mtd_device_unregister(nand_to_mtd(chip));
+               WARN_ON(ret);
+               nand_cleanup(chip);
+               list_del(&ingenic_chip->chip_list);
        }
 }