leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ASoC: wm8904: fix resource reclaim in wm8904_register error path

Browse Source 
This patch includes below fixes:
1. wm8904 need to be kfreed in wm8904_register() error path before return.
2. fix the error path for snd_soc_register_codec() fail and
   snd_soc_register_dai() fail to properly free resources.

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:48 +00:00 committed by Mark Brown
parent 2c2749de11
commit 62f5ad6733
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
sound/soc/codecs/wm8904.c
View File

@ -2433,7 +2433,8 @@ static int wm8904_register(struct wm8904_priv *wm8904,
if (wm8904_codec) { if (wm8904_codec) {
dev_err(codec->dev, "Another WM8904 is registered\n"); dev_err(codec->dev, "Another WM8904 is registered\n");
return -EINVAL; ret = -EINVAL;
goto err;
} }
mutex_init(&codec->mutex); mutex_init(&codec->mutex);
@ -2462,7 +2463,8 @@ static int wm8904_register(struct wm8904_priv *wm8904,
default: default:
dev_err(codec->dev, "Unknown device type %d\n", dev_err(codec->dev, "Unknown device type %d\n",
wm8904->devtype); wm8904->devtype);
return -EINVAL; ret = -EINVAL;
goto err;
} }
memcpy(codec->reg_cache, wm8904_reg, sizeof(wm8904_reg)); memcpy(codec->reg_cache, wm8904_reg, sizeof(wm8904_reg));
@ -2566,18 +2568,19 @@ static int wm8904_register(struct wm8904_priv *wm8904,
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(&wm8904_dai); ret = snd_soc_register_dai(&wm8904_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(wm8904->supplies), wm8904->supplies); regulator_bulk_disable(ARRAY_SIZE(wm8904->supplies), wm8904->supplies);
err_get: err_get: