diff options
| author | Alexander Shiyan <shc_work@mail.ru> | 2012-08-09 19:33:08 +0400 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2012-09-04 08:49:54 +0200 |
| commit | 7b6529354db5b95341cc57fad859a5a3993c74c6 (patch) | |
| tree | 13245bb98a67999ee630d69075b0290ca971ddae /drivers/mfd | |
| parent | fe0545bbb01fce1acb580ad19e75f2c0d56dff53 (diff) | |
| download | barebox-7b6529354db5b95341cc57fad859a5a3993c74c6.tar.gz barebox-7b6529354db5b95341cc57fad859a5a3993c74c6.tar.xz | |
mc13xxx: Fixed memory leak
A string allocated by asprintf is not freed, so change it to a sprintf
with the preallocated buffer.
Signed-off-by: Alexander Shiyan <shc_work@mail.ru>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'drivers/mfd')
| -rw-r--r-- | drivers/mfd/mc13xxx.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/mfd/mc13xxx.c b/drivers/mfd/mc13xxx.c index 8e3c0b095e..704446d019 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, "3.2a"); } else - revstr = asprintf("%d.%d", rev / 0x10, rev % 10); + sprintf(revstr, "%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, 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, "2.0a"); } } break; |