openwrt/upstream - upstream openwrt

diff options

author	Gabor Juhos <juhosg@openwrt.org>	2012-08-13 14:01:38 +0000
committer	Gabor Juhos <juhosg@openwrt.org>	2012-08-13 14:01:38 +0000
commit	5fc4b7f5fd2ce2a5bc528a6857fbe9bc9fd7bf07 (patch)
tree	873d17f1cd4234f64f5c85e66740e1ec0c39b604 /target/linux
parent	ca857b7a50506047aff1fef7b8ed3faa31f5075b (diff)
download	upstream-5fc4b7f5fd2ce2a5bc528a6857fbe9bc9fd7bf07.tar.gz upstream-5fc4b7f5fd2ce2a5bc528a6857fbe9bc9fd7bf07.tar.bz2 upstream-5fc4b7f5fd2ce2a5bc528a6857fbe9bc9fd7bf07.zip

ar71xx: uci-defaults/leds for ALL0258N

Signed-off-by: Daniel Golle <dgolle@allnet.de> SVN-Revision: 33165

Diffstat (limited to 'target/linux')

-rwxr-xr-x

target/linux/ar71xx/base-files/etc/uci-defaults/leds

1 files changed, 7 insertions, 0 deletions

--- a/drivers/mtd/devices/block2mtd.c +++ b/drivers/mtd/devices/block2mtd.c @@ -25,6 +25,7 @@ #include <linux/list.h> #include <linux/init.h> #include <linux/mtd/mtd.h> +#include <linux/mtd/partitions.h> #include <linux/mutex.h> #include <linux/mount.h> #include <linux/slab.h> @@ -218,7 +219,7 @@ static void block2mtd_free_device(struct static struct block2mtd_dev *add_device(char *devname, int erase_size, - int timeout) + const char *mtdname, int timeout) { #ifndef MODULE int i; @@ -226,6 +227,7 @@ static struct block2mtd_dev *add_device( const fmode_t mode = FMODE_READ | FMODE_WRITE | FMODE_EXCL; struct block_device *bdev = ERR_PTR(-ENODEV); struct block2mtd_dev *dev; + struct mtd_partition *part; char *name; if (!devname) @@ -282,13 +284,16 @@ static struct block2mtd_dev *add_device( /* Setup the MTD structure */ /* make the name contain the block device in */ - name = kasprintf(GFP_KERNEL, "block2mtd: %s", devname); + if (!mtdname) + mtdname = devname; + name = kmalloc(strlen(mtdname) + 1, GFP_KERNEL); if (!name) goto err_destroy_mutex; + strcpy(name, mtdname); dev->mtd.name = name; - dev->mtd.size = dev->blkdev->bd_inode->i_size & PAGE_MASK; + dev->mtd.size = dev->blkdev->bd_inode->i_size & PAGE_MASK & ~(erase_size - 1); dev->mtd.erasesize = erase_size; dev->mtd.writesize = 1; dev->mtd.writebufsize = PAGE_SIZE; @@ -301,7 +306,11 @@ static struct block2mtd_dev *add_device( dev->mtd.priv = dev; dev->mtd.owner = THIS_MODULE; - if (mtd_device_register(&dev->mtd, NULL, 0)) { + part = kzalloc(sizeof(struct mtd_partition), GFP_KERNEL); + part->name = name; + part->offset = 0; + part->size = dev->mtd.size; + if (mtd_device_register(&dev->mtd, part, 1)) { /* Device didn't get added, so free the entry */ goto err_destroy_mutex; } @@ -309,8 +318,7 @@ static struct block2mtd_dev *add_device( list_add(&dev->list, &blkmtd_device_list); pr_info("mtd%d: [%s] erase_size = %dKiB [%d]\n", dev->mtd.index, - dev->mtd.name + strlen("block2mtd: "), - dev->mtd.erasesize >> 10, dev->mtd.erasesize); + mtdname, dev->mtd.erasesize >> 10, dev->mtd.erasesize); return dev; err_destroy_mutex: @@ -383,7 +391,7 @@ static int block2mtd_setup2(const char * /* 80 for device, 12 for erase size, 80 for name, 8 for timeout */ char buf[80 + 12 + 80 + 8]; char *str = buf; - char *token[2]; + char *token[3]; char *name; size_t erase_size = PAGE_SIZE; unsigned long timeout = MTD_DEFAULT_TIMEOUT; @@ -397,7 +405,7 @@ static int block2mtd_setup2(const char * strcpy(str, val); kill_final_newline(str); - for (i = 0; i < 2; i++) + for (i = 0; i < 3; i++) token[i] = strsep(&str, ","); if (str) { @@ -423,8 +431,10 @@ static int block2mtd_setup2(const char * return 0; } } + if (token[2] && (strlen(token[2]) + 1 > 80)) + pr_err("mtd device name too long\n"); - add_device(name, erase_size, timeout); + add_device(name, erase_size, token[2], timeout); return 0; } @@ -458,7 +468,7 @@ static int block2mtd_setup(const char *v module_param_call(block2mtd, block2mtd_setup, NULL, NULL, 0200); -MODULE_PARM_DESC(block2mtd, "Device to use. \"block2mtd=<dev>[,<erasesize>]\""); +MODULE_PARM_DESC(block2mtd, "Device to use. \"block2mtd=<dev>[,<erasesize>[,<name>]]\""); static int __init block2mtd_init(void) {


context:
space:
mode: