| Message ID | 20200717082242.130627-1-jingxiangfeng@huawei.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | bd054ece7d9cdd88e900df6625e951a01d9f655e |
| Headers | show |
| Series | [v2] ASoC: meson: fixes the missed kfree() for axg_card_add_tdm_loopback | expand |
On Fri 17 Jul 2020 at 10:22, Jing Xiangfeng <jingxiangfeng@huawei.com> wrote: > 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> > --- > 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 89f7f64747cd..47f2d93224fe 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;
On Fri, 17 Jul 2020 16:22:42 +0800, Jing Xiangfeng wrote: > 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. Applied to https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next Thanks! [1/1] ASoC: meson: fixes the missed kfree() for axg_card_add_tdm_loopback commit: bd054ece7d9cdd88e900df6625e951a01d9f655e All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted. You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed. If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced. Please add any relevant lists and maintainers to the CCs when replying to this mail. Thanks, Mark
diff --git a/sound/soc/meson/axg-card.c b/sound/soc/meson/axg-card.c index 89f7f64747cd..47f2d93224fe 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;
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> --- sound/soc/meson/axg-card.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)