Commit eadcf0d7 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

MTD: handle pci_name() being const 



This changes the MTD core to handle pci_name() now returning a constant
string.

Cc: David Woodhouse <dwmw2@infradead.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 89bcb05d

drivers/mtd/devices/block2mtd.c

+5 −3
Original line number Diff line number Diff line
@@ -241,6 +241,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;
@@ -279,12 +280,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;

include/linux/mtd/map.h

+1 −1
Original line number Diff line number Diff line
@@ -189,7 +189,7 @@ typedef union { 
*/



struct map_info {

	char *name;

	const char *name;

	unsigned long size;

	resource_size_t phys;

#define NO_XIP (-1UL)

include/linux/mtd/mtd.h

+1 −1
Original line number Diff line number Diff line
@@ -121,7 +121,7 @@ struct mtd_info { 
	u_int32_t oobavail;  // Available OOB bytes per block



	// Kernel-only stuff starts here.

	char *name;

	const char *name;

	int index;



	/* ecc layout structure pointer - read only ! */