openkylin
/
platform_kernel-5.15
mirror of https://gitee.com/openkylin/platform_kernel-5.15.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

ASoC: wm8523: fix resource reclaim in wm8523_register error path 

This patch includes below fixes:
1. If another WM8523 is registered, need to kfree wm8523 before return -EINVAL.
2. If snd_soc_register_codec failed, goto error path to properly free resources.
3. Instead of using mixed in-line and goto style cleanup, use goto style error
   handling if snd_soc_register_dai failed.

Signed-off-by: Axel Lin <axel.lin@gmail.com>
Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
This commit is contained in:
Axel Lin 2010-07-23 05:53:46 +00:00 committed by Mark Brown
parent 085efd28b6
commit ef99e9b5a1
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
sound/soc/codecs/wm8523.c
View File

@ -482,7 +482,8 @@ static int wm8523_register(struct wm8523_priv *wm8523,
if (wm8523_codec) { if (wm8523_codec) {
dev_err(codec->dev, "Another WM8523 is registered\n"); dev_err(codec->dev, "Another WM8523 is registered\n");
return -EINVAL; ret = -EINVAL;
goto err;
} }
mutex_init(&codec->mutex); mutex_init(&codec->mutex);
@ -570,18 +571,19 @@ static int wm8523_register(struct wm8523_priv *wm8523,
ret = snd_soc_register_codec(codec); ret = snd_soc_register_codec(codec);
if (ret != 0) { if (ret != 0) {
dev_err(codec->dev, "Failed to register codec: %d\n", ret); dev_err(codec->dev, "Failed to register codec: %d\n", ret);
return ret; goto err_enable;
} }
ret = snd_soc_register_dai(&wm8523_dai); ret = snd_soc_register_dai(&wm8523_dai);
if (ret != 0) { if (ret != 0) {
dev_err(codec->dev, "Failed to register DAI: %d\n", ret); dev_err(codec->dev, "Failed to register DAI: %d\n", ret);
snd_soc_unregister_codec(codec); goto err_codec;
return ret;
} }
return 0; return 0;
err_codec:
snd_soc_unregister_codec(codec);
err_enable: err_enable:
regulator_bulk_disable(ARRAY_SIZE(wm8523->supplies), wm8523->supplies); regulator_bulk_disable(ARRAY_SIZE(wm8523->supplies), wm8523->supplies);
err_get: err_get: