Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7dfe4be3 authored by Baruch Siach's avatar Baruch Siach Committed by David Woodhouse
Browse files

mtd: physmap_of: fix cmdline partition method w/o linux, mtd-name 



Commit d68cbdd4 (mtd: physmap_of: allow to specify the mtd name for retro
compatiblity) broke cmdline partitioning using dev_name() in the kernel command
line.  of_property_read_string() does not touch mtd_name when linux,mtd-name is
not present in the device tree, which causes map.name to be set to a random
value.  Fix this by initializing mtd_name to NULL.

Cc: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Signed-off-by: default avatarBaruch Siach <baruch@tkos.co.il>
Signed-off-by: default avatarDavid Woodhouse <David.Woodhouse@intel.com>
parent bf65aaa6

drivers/mtd/maps/physmap_of.c

+1 −1
Original line number Diff line number Diff line
@@ -170,7 +170,7 @@ static int of_flash_probe(struct platform_device *dev) 
	resource_size_t res_size;

	struct mtd_part_parser_data ppdata;

	bool map_indirect;

	const char *mtd_name;

	const char *mtd_name = NULL;



	match = of_match_device(of_flash_match, &dev->dev);

	if (!match)