ARM: OMAP3: mmc-twl4030 allow arbitrary slot names, v3

Signed-off-by: Adrian Hunter <adrian.hunter@nokia.com>
Acked-by: David Brownell <dbrownell@users.sourceforge.net>
Signed-off-by: Tony Lindgren <tony@atomide.com>

1 files changed, 5 insertions, 2 deletions

diff --git a/arch/arm/mach-omap2/mmc-twl4030.c b/arch/arm/mach-omap2/mmc-twl4030.c
index e2b2aeb713d8..dc40b3e72206 100644
--- a/arch/arm/mach-omap2/mmc-twl4030.c
+++ b/arch/arm/mach-omap2/mmc-twl4030.c
@@ -402,8 +402,11 @@ void __init twl4030_mmc_init(struct twl4030_hsmmc_info *controllers)
                         return;
                 }
 
-                snprintf(twl->name, ARRAY_SIZE(twl->name), "mmc%islot%i",
-                                c->mmc, 1);
+                if (c->name)
+                        strncpy(twl->name, c->name, HSMMC_NAME_LEN);
+                else
+                        snprintf(twl->name, ARRAY_SIZE(twl->name),
+                                "mmc%islot%i", c->mmc, 1);
                 mmc->slots[0].name = twl->name;
                 mmc->nr_slots = 1;
                 mmc->slots[0].wires = c->wires;