| From d10d2e4bd4a65c267eff7536aec5c97119ca195a Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Fri, 17 Jul 2020 16:22:42 +0800 |
| Subject: ASoC: meson: fixes the missed kfree() for axg_card_add_tdm_loopback |
| |
| From: Jing Xiangfeng <jingxiangfeng@huawei.com> |
| |
| [ Upstream commit bd054ece7d9cdd88e900df6625e951a01d9f655e ] |
| |
| axg_card_add_tdm_loopback() misses to call kfree() in an error path. We |
| can use devm_kasprintf() to fix the issue, also improve maintainability. |
| So use it instead. |
| |
| Fixes: c84836d7f650 ("ASoC: meson: axg-card: use modern dai_link style") |
| Signed-off-by: Jing Xiangfeng <jingxiangfeng@huawei.com> |
| Reviewed-by: Jerome Brunet <jbrunet@baylibre.com> |
| Link: https://lore.kernel.org/r/20200717082242.130627-1-jingxiangfeng@huawei.com |
| Signed-off-by: Mark Brown <broonie@kernel.org> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| sound/soc/meson/axg-card.c | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| diff --git a/sound/soc/meson/axg-card.c b/sound/soc/meson/axg-card.c |
| index 89f7f64747cd0..47f2d93224fea 100644 |
| --- a/sound/soc/meson/axg-card.c |
| +++ b/sound/soc/meson/axg-card.c |
| @@ -116,7 +116,7 @@ static int axg_card_add_tdm_loopback(struct snd_soc_card *card, |
| |
| lb = &card->dai_link[*index + 1]; |
| |
| - lb->name = kasprintf(GFP_KERNEL, "%s-lb", pad->name); |
| + lb->name = devm_kasprintf(card->dev, GFP_KERNEL, "%s-lb", pad->name); |
| if (!lb->name) |
| return -ENOMEM; |
| |
| -- |
| 2.25.1 |
| |
