Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[pandora-kernel.git] / drivers / mtd / devices / block2mtd.c

diff --git a/drivers/mtd/devices/block2mtd.c b/drivers/mtd/devices/block2mtd.c
index ce64240..9365186 100644 (file)
--- a/drivers/mtd/devices/block2mtd.c
+++ b/drivers/mtd/devices/block2mtd.c
@@ -276,12 +276,10 @@ static struct block2mtd_dev *add_device(char *devname, int erase_size)
 
        /* Setup the MTD structure */
        /* make the name contain the block device in */
-       name = kmalloc(sizeof("block2mtd: ") + strlen(devname) + 1,
-                       GFP_KERNEL);
+       name = kasprintf(GFP_KERNEL, "block2mtd: %s", devname);
        if (!name)
                goto devinit_err;
 
-       sprintf(name, "block2mtd: %s", devname);
        dev->mtd.name = name;
 
        dev->mtd.size = dev->blkdev->bd_inode->i_size & PAGE_MASK;