Merge branch 'linux-next' of git://git.infradead.org/~dedekind/ubi-2.6

1 files changed, 5 insertions, 3 deletions

diff --git a/drivers/mtd/devices/block2mtd.c b/drivers/mtd/devices/block2mtd.c
index 303ea9b8cfe4..91fbba767635 100644
--- a/drivers/mtd/devices/block2mtd.c
+++ b/drivers/mtd/devices/block2mtd.c
@@ -236,6 +236,7 @@ static struct block2mtd_dev *add_device(char *devname, int erase_size)
 {
         struct block_device *bdev;
         struct block2mtd_dev *dev;
+        char *name;
 
         if (!devname)
                 return NULL;
@@ -274,12 +275,13 @@ static struct block2mtd_dev *add_device(char *devname, int erase_size)
 
         /* Setup the MTD structure */
         /* make the name contain the block device in */
-        dev->mtd.name = kmalloc(sizeof("block2mtd: ") + strlen(devname),
+        name = kmalloc(sizeof("block2mtd: ") + strlen(devname) + 1,
                         GFP_KERNEL);
-        if (!dev->mtd.name)
+        if (!name)
                 goto devinit_err;
 
-        sprintf(dev->mtd.name, "block2mtd: %s", devname);
+        sprintf(name, "block2mtd: %s", devname);
+        dev->mtd.name = name;
 
         dev->mtd.size = dev->blkdev->bd_inode->i_size & PAGE_MASK;
         dev->mtd.erasesize = erase_size;