diff options
| author | Adrian Hunter <adrian.hunter@nokia.com> | 2009-03-24 02:23:46 +0100 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2009-03-24 02:51:22 +0100 |
| commit | 8466032d862a2e52d73af3311bc97f950aaa36c8 (patch) | |
| tree | cba5a396e739d33b55ea58f922123c7e3cbfef86 /arch/arm/mach-omap2 | |
| parent | ARM: OMAP3: Add more GPIO mux options (diff) | |
| download | linux-8466032d862a2e52d73af3311bc97f950aaa36c8.tar.xz linux-8466032d862a2e52d73af3311bc97f950aaa36c8.zip | |
ARM: OMAP3: mmc-twl4030 fix name buffer length, v2
Add 1 to buffer length for null terminator and use snprintf.
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>
Diffstat (limited to 'arch/arm/mach-omap2')
| -rw-r--r-- | arch/arm/mach-omap2/mmc-twl4030.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/arm/mach-omap2/mmc-twl4030.c b/arch/arm/mach-omap2/mmc-twl4030.c index 437f52073f6e..84cac87537a3 100644 --- a/arch/arm/mach-omap2/mmc-twl4030.c +++ b/arch/arm/mach-omap2/mmc-twl4030.c @@ -59,7 +59,7 @@ static struct twl_mmc_controller { struct omap_mmc_platform_data *mmc; u8 twl_vmmc_dev_grp; u8 twl_mmc_dedicated; - char name[HSMMC_NAME_LEN]; + char name[HSMMC_NAME_LEN + 1]; } hsmmc[] = { { .twl_vmmc_dev_grp = VMMC1_DEV_GRP, @@ -349,7 +349,8 @@ void __init twl4030_mmc_init(struct twl4030_hsmmc_info *controllers) return; } - sprintf(twl->name, "mmc%islot%i", c->mmc, 1); + 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].ocr_mask = MMC_VDD_165_195 | |