diff options
| author | Roger Quadros <ext-roger.quadros@nokia.com> | 2009-08-10 14:49:51 +0300 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2009-08-10 14:49:51 +0300 |
| commit | 22833044fbe2764d44ae03f58508e671652ca186 (patch) | |
| tree | ac80af411b34c65a3e5ecbed9fcaa23719fdb47d /arch/arm | |
| parent | dfc27b34496923b5f552eb9cdf20468045114ada (diff) | |
| download | blackbird-op-linux-22833044fbe2764d44ae03f58508e671652ca186.tar.gz blackbird-op-linux-22833044fbe2764d44ae03f58508e671652ca186.zip | |
OMAP2/3: mmc-twl4030: Free up MMC regulators while cleaning up
twl_mmc_cleanup() must free up the regulators that were
allocated by twl_mmc_late_init().
This eliminates the below error when 'omap_hsmmc' module is
repeatedly loaded and unloaded.
"sysfs: cannot create duplicate filename '/devices/platform
/mmci-omap-hs.0/microamps_requested_vmmc'"
Signed-off-by: Roger Quadros <ext-roger.quadros@nokia.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/mach-omap2/mmc-twl4030.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/arch/arm/mach-omap2/mmc-twl4030.c b/arch/arm/mach-omap2/mmc-twl4030.c index 1541fd4c8d0f..3c04c2f1b23f 100644 --- a/arch/arm/mach-omap2/mmc-twl4030.c +++ b/arch/arm/mach-omap2/mmc-twl4030.c @@ -119,6 +119,7 @@ static int twl_mmc_late_init(struct device *dev) if (i != 0) break; ret = PTR_ERR(reg); + hsmmc[i].vcc = NULL; goto err; } hsmmc[i].vcc = reg; @@ -165,8 +166,13 @@ done: static void twl_mmc_cleanup(struct device *dev) { struct omap_mmc_platform_data *mmc = dev->platform_data; + int i; gpio_free(mmc->slots[0].switch_pin); + for(i = 0; i < ARRAY_SIZE(hsmmc); i++) { + regulator_put(hsmmc[i].vcc); + regulator_put(hsmmc[i].vcc_aux); + } } #ifdef CONFIG_PM |
