diff options
author | Paul Mundt <lethal@linux-sh.org> | 2010-02-15 14:49:37 +0900 |
---|---|---|
committer | Paul Mundt <lethal@linux-sh.org> | 2010-02-15 14:49:37 +0900 |
commit | 028c5d5d596651bce13d06737eb3707a7e99a30c (patch) | |
tree | e4e429858a19635ad2b5aa563bf1b4e39396d4e2 /arch/arm | |
parent | 19f6b8b44e3f633d5d7d1ed68848b1eb89a1e800 (diff) | |
parent | 4b505db9c4c72dbd2a8e66b8d681640101325af6 (diff) |
Merge branch 'sh/stable-updates'
Diffstat (limited to 'arch/arm')
-rw-r--r-- | arch/arm/mach-omap2/mmc-twl4030.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/mmc-twl4030.c b/arch/arm/mach-omap2/mmc-twl4030.c index 0c3c72d934b..8afe9dd3f15 100644 --- a/arch/arm/mach-omap2/mmc-twl4030.c +++ b/arch/arm/mach-omap2/mmc-twl4030.c @@ -408,6 +408,7 @@ void __init twl4030_mmc_init(struct twl4030_hsmmc_info *controllers) { struct twl4030_hsmmc_info *c; int nr_hsmmc = ARRAY_SIZE(hsmmc_data); + int i; if (cpu_is_omap2430()) { 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); if (!mmc) { pr_err("Cannot allocate memory for mmc device!\n"); - return; + goto done; } if (c->name) @@ -532,6 +533,10 @@ void __init twl4030_mmc_init(struct twl4030_hsmmc_info *controllers) continue; c->dev = mmc->dev; } + +done: + for (i = 0; i < nr_hsmmc; i++) + kfree(hsmmc_data[i]); } #endif |