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

Commit 4dfd459b authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'omap-fixes-for-linus' of... 

Merge branch 'omap-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6

* 'omap-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6:
  OMAP: hsmmc: fix memory leak
parents 676ad585 a6c7fdd2

arch/arm/mach-omap2/mmc-twl4030.c

+6 −1
Original line number Original line Diff line number Diff line
@@ -408,6 +408,7 @@ void __init twl4030_mmc_init(struct twl4030_hsmmc_info *controllers) 
{

{

	struct twl4030_hsmmc_info *c;

	struct twl4030_hsmmc_info *c;

	int nr_hsmmc = ARRAY_SIZE(hsmmc_data);

	int nr_hsmmc = ARRAY_SIZE(hsmmc_data);

	int i;





	if (cpu_is_omap2430()) {

	if (cpu_is_omap2430()) {

		control_pbias_offset = OMAP243X_CONTROL_PBIAS_LITE;

		control_pbias_offset = OMAP243X_CONTROL_PBIAS_LITE;
@@ -434,7 +435,7 @@ void __init twl4030_mmc_init(struct twl4030_hsmmc_info *controllers) 
		mmc = kzalloc(sizeof(struct omap_mmc_platform_data), GFP_KERNEL);

		mmc = kzalloc(sizeof(struct omap_mmc_platform_data), GFP_KERNEL);

		if (!mmc) {

		if (!mmc) {

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

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

			return;

			goto done;

		}

		}





		if (c->name)

		if (c->name)
@@ -532,6 +533,10 @@ void __init twl4030_mmc_init(struct twl4030_hsmmc_info *controllers) 
			continue;

			continue;

		c->dev = mmc->dev;

		c->dev = mmc->dev;

	}

	}



done:

	for (i = 0; i < nr_hsmmc; i++)

		kfree(hsmmc_data[i]);

}

}





#endif
 
#endif