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

Commit 1a61a2a5 authored by Markus Elfring's avatar Markus Elfring Committed by Tony Lindgren
Browse files

ARM: OMAP2+: Delete an error message for a failed memory allocation in two functions 

Omit an extra message for a memory allocation failure in these functions.

This issue was detected by using the Coccinelle software.

Link: http://events.linuxfoundation.org/sites/events/files/slides/LCJ16-Refactor_Strings-WSang_0.pdf


Signed-off-by: default avatarMarkus Elfring <elfring@users.sourceforge.net>
Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
parent 33d3842d

arch/arm/mach-omap2/hsmmc.c

+1 −4
Original line number Diff line number Diff line
@@ -153,7 +153,6 @@ static int __init omap_hsmmc_pdata_init(struct omap2_hsmmc_info *c, 


	hc_name = kzalloc(sizeof(char) * (HSMMC_NAME_LEN + 1), GFP_KERNEL);

	if (!hc_name) {

		pr_err("Cannot allocate memory for controller slot name\n");

		kfree(hc_name);

		return -ENOMEM;

	}
@@ -315,10 +314,8 @@ static void __init omap_hsmmc_init_one(struct omap2_hsmmc_info *hsmmcinfo, 
	int res;



	mmc_data = kzalloc(sizeof(*mmc_data), GFP_KERNEL);

	if (!mmc_data) {

		pr_err("Cannot allocate memory for mmc device!\n");

	if (!mmc_data)

		return;

	}



	res = omap_hsmmc_pdata_init(hsmmcinfo, mmc_data);

	if (res < 0)