From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from smtp15.mail.ru ([94.100.176.133]) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1SxaSy-0005vj-N9 for barebox@lists.infradead.org; Sat, 04 Aug 2012 09:16:13 +0000 From: Alexander Shiyan Date: Sat, 4 Aug 2012 13:15:55 +0400 Message-Id: <1344071755-6733-3-git-send-email-shc_work@mail.ru> In-Reply-To: <1344071755-6733-1-git-send-email-shc_work@mail.ru> References: <1344071755-6733-1-git-send-email-shc_work@mail.ru> List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: barebox-bounces@lists.infradead.org Errors-To: barebox-bounces+u.kleine-koenig=pengutronix.de@lists.infradead.org Subject: [PATCH 3/3] mc13xxx: Fixed memory leak To: barebox@lists.infradead.org A string allocated by asprintf is not freed, so change it to a sprintf with the preallocated buffer. Signed-off-by: Alexander Shiyan --- drivers/mfd/mc13xxx.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/drivers/mfd/mc13xxx.c b/drivers/mfd/mc13xxx.c index 8e3c0b0..2373254 100644 --- a/drivers/mfd/mc13xxx.c +++ b/drivers/mfd/mc13xxx.c @@ -252,7 +252,7 @@ static struct mc13892_rev mc13892_revisions[] = { static int mc13xxx_query_revision(struct mc13xxx *mc13xxx) { unsigned int rev_id; - char *chipname, *revstr; + char *chipname, revstr[5]; int rev, i; mc13xxx_reg_read(mc13xxx, MC13XXX_REG_IDENTIFICATION, &rev_id); @@ -265,9 +265,9 @@ static int mc13xxx_query_revision(struct mc13xxx *mc13xxx) /* Ver 0.2 is actually 3.2a. Report as 3.2 */ if (rev == 0x02) { rev = 0x32; - revstr = "3.2a"; + strcpy(&revstr[0], "3.2a"); } else - revstr = asprintf("%d.%d", rev / 0x10, rev % 10); + sprintf(&revstr[0], "%d.%d", rev / 0x10, rev % 10); break; case 7: chipname = "MC13892"; @@ -279,12 +279,12 @@ static int mc13xxx_query_revision(struct mc13xxx *mc13xxx) return -EINVAL; rev = mc13892_revisions[i].rev; - revstr = mc13892_revisions[i].revstr; + strcpy(&revstr[0], mc13892_revisions[i].revstr); if (rev == MC13892_REVISION_2_0) { if ((rev_id >> 9) & 0x3) { rev = MC13892_REVISION_2_0a; - revstr = "2.0a"; + strcpy(&revstr[0], "2.0a"); } } break; @@ -294,7 +294,7 @@ static int mc13xxx_query_revision(struct mc13xxx *mc13xxx) } dev_info(mc_dev->cdev.dev, "Found %s ID: 0x%06x [Rev: %s]\n", - chipname, rev_id, revstr); + chipname, rev_id, &revstr[0]); mc13xxx->revision = rev; -- 1.7.3.4 _______________________________________________ barebox mailing list barebox@lists.infradead.org http://lists.infradead.org/mailman/listinfo/barebox