From 12c4bb346fcf69e3aa1092c2e555715a41b8c46e Mon Sep 17 00:00:00 2001 From: Adrian Hunter Date: Mon, 23 Mar 2009 18:23:46 -0700 Subject: [PATCH] --- yaml --- r: 137491 b: refs/heads/master c: 8466032d862a2e52d73af3311bc97f950aaa36c8 h: refs/heads/master i: 137489: 10f78ecd912ba08d334fef8a3d3f7ffc346032e2 137487: 3d6a872f1a5d7e15978279625b2f6e9649b89e3b v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-omap2/mmc-twl4030.c | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 6dc8e6204077..8964e8e8b10b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b9d766c767d53a9be1f741a53fe8151354ba1da3 +refs/heads/master: 8466032d862a2e52d73af3311bc97f950aaa36c8 diff --git a/trunk/arch/arm/mach-omap2/mmc-twl4030.c b/trunk/arch/arm/mach-omap2/mmc-twl4030.c index 437f52073f6e..84cac87537a3 100644 --- a/trunk/arch/arm/mach-omap2/mmc-twl4030.c +++ b/trunk/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 |