summaryrefslogtreecommitdiffstats
path: root/drivers/mtd/core.c
diff options
context:
space:
mode:
authorSascha Hauer <s.hauer@pengutronix.de>2015-02-06 08:36:59 +0100
committerSascha Hauer <s.hauer@pengutronix.de>2015-02-12 09:33:42 +0100
commitb798f554959829d89047056741da45e40ee63ee7 (patch)
treef1569a82928e8824cd1aee16dbc00a2db006a05a /drivers/mtd/core.c
parent977be3d7156141ffc2207c268ecd7bbc854b5e2e (diff)
downloadbarebox-b798f554959829d89047056741da45e40ee63ee7.tar.gz
barebox-b798f554959829d89047056741da45e40ee63ee7.tar.xz
mtd: core: add error checks
register_device and devfs_create can fail. Add error checks for these. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'drivers/mtd/core.c')
-rw-r--r--drivers/mtd/core.c15
1 files changed, 13 insertions, 2 deletions
diff --git a/drivers/mtd/core.c b/drivers/mtd/core.c
index 345752ecfe..21d04a14eb 100644
--- a/drivers/mtd/core.c
+++ b/drivers/mtd/core.c
@@ -380,6 +380,7 @@ static struct file_operations mtd_ops = {
int add_mtd_device(struct mtd_info *mtd, char *devname, int device_id)
{
struct mtddev_hook *hook;
+ int ret;
if (!devname)
devname = "mtd";
@@ -387,7 +388,10 @@ int add_mtd_device(struct mtd_info *mtd, char *devname, int device_id)
mtd->class_dev.id = device_id;
if (mtd->parent)
mtd->class_dev.parent = mtd->parent;
- register_device(&mtd->class_dev);
+
+ ret = register_device(&mtd->class_dev);
+ if (ret)
+ return ret;
mtd->cdev.ops = &mtd_ops;
mtd->cdev.size = mtd->size;
@@ -407,7 +411,9 @@ int add_mtd_device(struct mtd_info *mtd, char *devname, int device_id)
dev_add_param_int_ro(&mtd->class_dev, "oobsize", mtd->oobsize, "%u");
}
- devfs_create(&mtd->cdev);
+ ret = devfs_create(&mtd->cdev);
+ if (ret)
+ goto err;
if (mtd_can_have_bb(mtd))
mtd->cdev_bb = mtd_add_bb(mtd, NULL);
@@ -420,6 +426,11 @@ int add_mtd_device(struct mtd_info *mtd, char *devname, int device_id)
hook->add_mtd_device(mtd, devname, &hook->priv);
return 0;
+err:
+ free(mtd->cdev.name);
+ unregister_device(&mtd->class_dev);
+
+ return ret;
}
int del_mtd_device (struct mtd_info *mtd)