summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--defaultenv/defaultenv-2-base/bin/mtdparts-add3
-rw-r--r--drivers/mtd/core.c2
-rw-r--r--drivers/mtd/nand/nand-bb.c16
-rw-r--r--include/nand.h7
4 files changed, 19 insertions, 9 deletions
diff --git a/defaultenv/defaultenv-2-base/bin/mtdparts-add b/defaultenv/defaultenv-2-base/bin/mtdparts-add
index 05ab638..f49561c 100644
--- a/defaultenv/defaultenv-2-base/bin/mtdparts-add
+++ b/defaultenv/defaultenv-2-base/bin/mtdparts-add
@@ -30,9 +30,6 @@ if [ -z "${parts}" ]; then
fi
if [ -e /tmp/mtdparts/${device} ]; then
- if [ -n "/dev/${device}.*.bb" ]; then
- nand -d /dev/${device}.*.bb
- fi
delpart /dev/${device}.*
fi
diff --git a/drivers/mtd/core.c b/drivers/mtd/core.c
index f5c03db..813edc5 100644
--- a/drivers/mtd/core.c
+++ b/drivers/mtd/core.c
@@ -447,6 +447,8 @@ int del_mtd_device (struct mtd_info *mtd)
hook->del_mtd_device(mtd, &hook->priv);
devfs_remove(&mtd->cdev);
+ if (mtd->cdev_bb)
+ mtd_del_bb(mtd);
unregister_device(&mtd->class_dev);
free(mtd->param_size.value);
free(mtd->cdev.name);
diff --git a/drivers/mtd/nand/nand-bb.c b/drivers/mtd/nand/nand-bb.c
index 23957c3..539c685 100644
--- a/drivers/mtd/nand/nand-bb.c
+++ b/drivers/mtd/nand/nand-bb.c
@@ -307,6 +307,17 @@ err:
return ERR_PTR(ret);
}
+void mtd_del_bb(struct mtd_info *mtd)
+{
+ struct cdev *cdev = mtd->cdev_bb;
+ struct nand_bb *bb = container_of(cdev, struct nand_bb, cdev);
+
+ devfs_remove(&bb->cdev);
+ list_del_init(&bb->list);
+ free(bb->name);
+ free(bb);
+}
+
/**
* Add a bad block aware device ontop of another (NAND) device
* @param[in] dev The device to add a partition on
@@ -335,10 +346,7 @@ int dev_remove_bb_dev(const char *name)
list_for_each_entry_safe(bb, tmp, &bb_list, list) {
if (!strcmp(bb->cdev.name, name)) {
- devfs_remove(&bb->cdev);
- list_del_init(&bb->list);
- free(bb->name);
- free(bb);
+ mtd_del_bb(bb->mtd);
return 0;
}
}
diff --git a/include/nand.h b/include/nand.h
index 1da35d0..fb3b5a1 100644
--- a/include/nand.h
+++ b/include/nand.h
@@ -1,4 +1,3 @@
-
#ifndef __NAND_H__
#define __NAND_H__
@@ -8,6 +7,7 @@ struct nand_bb;
int dev_add_bb_dev(const char *filename, const char *name);
int dev_remove_bb_dev(const char *name);
struct cdev *mtd_add_bb(struct mtd_info *mtd, const char *name);
+void mtd_del_bb(struct mtd_info *mtd);
#else
static inline int dev_add_bb_dev(const char *filename, const char *name) {
return 0;
@@ -21,7 +21,10 @@ static inline struct cdev *mtd_add_bb(struct mtd_info *mtd, const char *name)
{
return NULL;
}
+
+static inline void mtd_del_bb(struct mtd_info *mtd)
+{
+}
#endif
#endif /* __NAND_H__ */
-