The mtdoob and mtdraw device don't clean up correctly. Added a private data element to hold allocated memory. Fix remove of mtdoob and mtdraw device.
Signed-off-by: Alexander Aring <[email protected]> --- drivers/mtd/core.c | 6 ++++-- drivers/mtd/mtd.h | 5 +++-- drivers/mtd/mtdoob.c | 15 ++++++++++++++- drivers/mtd/mtdraw.c | 15 ++++++++++++++- 4 files changed, 35 insertions(+), 6 deletions(-) diff --git a/drivers/mtd/core.c b/drivers/mtd/core.c index 3dcc908..a6132e8 100644 --- a/drivers/mtd/core.c +++ b/drivers/mtd/core.c @@ -248,7 +248,7 @@ int add_mtd_device(struct mtd_info *mtd, char *devname) list_for_each_entry(hook, &mtd_register_hooks, hook) if (hook->add_mtd_device) - hook->add_mtd_device(mtd, devname); + hook->add_mtd_device(mtd, devname, &hook->priv); return 0; } @@ -259,7 +259,9 @@ int del_mtd_device (struct mtd_info *mtd) list_for_each_entry(hook, &mtd_register_hooks, hook) if (hook->del_mtd_device) - hook->del_mtd_device(mtd); + hook->del_mtd_device(mtd, &hook->priv); + + devfs_remove(&mtd->cdev); unregister_device(&mtd->class_dev); free(mtd->param_size.value); free(mtd->cdev.name); diff --git a/drivers/mtd/mtd.h b/drivers/mtd/mtd.h index c8af6e3..414bd6c 100644 --- a/drivers/mtd/mtd.h +++ b/drivers/mtd/mtd.h @@ -25,8 +25,9 @@ */ struct mtddev_hook { struct list_head hook; - int (*add_mtd_device)(struct mtd_info *mtd, char *devname); - int (*del_mtd_device)(struct mtd_info *mtd); + int (*add_mtd_device)(struct mtd_info *mtd, char *devname, void **priv); + int (*del_mtd_device)(struct mtd_info *mtd, void **priv); + void *priv; }; struct cdev; diff --git a/drivers/mtd/mtdoob.c b/drivers/mtd/mtdoob.c index e4dd1a0..c7bf40c 100644 --- a/drivers/mtd/mtdoob.c +++ b/drivers/mtd/mtdoob.c @@ -69,7 +69,7 @@ static struct file_operations mtd_ops_oob = { .lseek = dev_lseek_default, }; -static int add_mtdoob_device(struct mtd_info *mtd, char *devname) +static int add_mtdoob_device(struct mtd_info *mtd, char *devname, void **priv) { struct mtdoob *mtdoob; @@ -80,13 +80,26 @@ static int add_mtdoob_device(struct mtd_info *mtd, char *devname) mtdoob->cdev.priv = mtdoob; mtdoob->cdev.dev = &mtd->class_dev; mtdoob->mtd = mtd; + *priv = mtdoob; devfs_create(&mtdoob->cdev); return 0; } +static int del_mtdoob_device(struct mtd_info *mtd, void **priv) +{ + struct mtdoob *mtdoob; + + mtdoob = *priv; + devfs_remove(&mtdoob->cdev); + free(mtdoob); + + return 0; +} + static struct mtddev_hook mtdoob_hook = { .add_mtd_device = add_mtdoob_device, + .del_mtd_device = del_mtdoob_device, }; static int __init register_mtdoob(void) diff --git a/drivers/mtd/mtdraw.c b/drivers/mtd/mtdraw.c index 9961a75..16157e9 100644 --- a/drivers/mtd/mtdraw.c +++ b/drivers/mtd/mtdraw.c @@ -275,7 +275,7 @@ static const struct file_operations mtd_raw_fops = { .lseek = dev_lseek_default, }; -static int add_mtdraw_device(struct mtd_info *mtd, char *devname) +static int add_mtdraw_device(struct mtd_info *mtd, char *devname, void **priv) { struct mtdraw *mtdraw; @@ -290,13 +290,26 @@ static int add_mtdraw_device(struct mtd_info *mtd, char *devname) mtdraw->cdev.priv = mtdraw; mtdraw->cdev.dev = &mtd->class_dev; mtdraw->cdev.mtd = mtd; + *priv = mtdraw; devfs_create(&mtdraw->cdev); return 0; } +static int del_mtdraw_device(struct mtd_info *mtd, void **priv) +{ + struct mtdraw *mtdraw; + + mtdraw = *priv; + devfs_remove(&mtdraw->cdev); + free(mtdraw); + + return 0; +} + static struct mtddev_hook mtdraw_hook = { .add_mtd_device = add_mtdraw_device, + .del_mtd_device = del_mtdraw_device, }; static int __init register_mtdraw(void) -- 1.7.12 _______________________________________________ barebox mailing list [email protected] http://lists.infradead.org/mailman/listinfo/barebox
