diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2013-08-05 12:50:06 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2013-08-05 12:50:06 +0200 |
| commit | fbf082b56540b4f3853015f3686c8f106a91707a (patch) | |
| tree | e5901744625d45ca075a55eff3c9fc1e2c05a134 /common | |
| parent | 8c5a1c0c81aade3546a18b12e2eeff0b38e79e99 (diff) | |
| parent | 6a37488917b22fcf24d99c695ed1755198a9393b (diff) | |
| download | barebox-fbf082b56540b4f3853015f3686c8f106a91707a.tar.gz barebox-fbf082b56540b4f3853015f3686c8f106a91707a.tar.xz | |
Merge branch 'for-next/of'
Conflicts:
arch/arm/boards/freescale-mx53-loco/board.c
drivers/of/Makefile
Diffstat (limited to 'common')
| -rw-r--r-- | common/environment.c | 10 | ||||
| -rw-r--r-- | common/partitions.c | 12 |
2 files changed, 16 insertions, 6 deletions
diff --git a/common/environment.c b/common/environment.c index 78cd45cce7..24487775d7 100644 --- a/common/environment.c +++ b/common/environment.c @@ -379,7 +379,7 @@ out: int envfs_register_partition(const char *devname, unsigned int partnr) { - struct cdev *cdev; + struct cdev *cdev, *part; char *partname; if (!devname) @@ -398,8 +398,14 @@ int envfs_register_partition(const char *devname, unsigned int partnr) return -ENODEV; } - return devfs_add_partition(partname, 0, cdev->size, + part = devfs_add_partition(partname, 0, cdev->size, DEVFS_PARTITION_FIXED, "env0"); + if (part) + return 0; + + free(partname); + + return -EINVAL; } EXPORT_SYMBOL(envfs_register_partition); #endif diff --git a/common/partitions.c b/common/partitions.c index 35a604c35f..38032a349c 100644 --- a/common/partitions.c +++ b/common/partitions.c @@ -29,6 +29,7 @@ #include <disks.h> #include <filetype.h> #include <dma.h> +#include <linux/err.h> #include "partitions/parser.h" @@ -48,16 +49,19 @@ static int register_one_partition(struct block_device *blk, int ret; uint64_t start = part->first_sec * SECTOR_SIZE; uint64_t size = part->size * SECTOR_SIZE; + struct cdev *cdev; partition_name = asprintf("%s.%d", blk->cdev.name, no); if (!partition_name) return -ENOMEM; dev_dbg(blk->dev, "Registering partition %s on drive %s\n", partition_name, blk->cdev.name); - ret = devfs_add_partition(blk->cdev.name, + cdev = devfs_add_partition(blk->cdev.name, start, size, 0, partition_name); - if (ret) + if (IS_ERR(cdev)) { + ret = PTR_ERR(cdev); goto out; + } free(partition_name); @@ -70,10 +74,10 @@ static int register_one_partition(struct block_device *blk, dev_dbg(blk->dev, "Registering partition %s on drive %s\n", partition_name, blk->cdev.name); - ret = devfs_add_partition(blk->cdev.name, + cdev = devfs_add_partition(blk->cdev.name, start, size, 0, partition_name); - if (ret) + if (IS_ERR(cdev)) dev_warn(blk->dev, "Registering partition %s on drive %s failed\n", partition_name, blk->cdev.name); |