lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ASoC: Fix leaks in WM8731 probe error handling

Browse Source 
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
This commit is contained in:
Mark Brown
2009-07-05 15:18:01 +01:00
parent 096e49d5e6
commit fe5422fc4a
1 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
sound/soc/codecs/wm8731.c
View File

@@ -560,7 +560,8 @@ static int wm8731_register(struct wm8731_priv *wm8731)
if (wm8731_codec) { if (wm8731_codec) {
dev_err(codec->dev, "Another WM8731 is registered\n"); dev_err(codec->dev, "Another WM8731 is registered\n");
return -EINVAL; ret = -EINVAL;
goto err;
} }
mutex_init(&codec->mutex); mutex_init(&codec->mutex);
@@ -583,8 +584,8 @@ static int wm8731_register(struct wm8731_priv *wm8731)
ret = wm8731_reset(codec); ret = wm8731_reset(codec);
if (ret < 0) { if (ret < 0) {
dev_err(codec->dev, "Failed to issue reset\n"); dev_err(codec->dev, "Failed to issue reset: %d\n", ret);
return ret; goto err;
} }
wm8731_dai.dev = codec->dev; wm8731_dai.dev = codec->dev;
@@ -610,17 +611,23 @@ static int wm8731_register(struct wm8731_priv *wm8731)
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;
} }
ret = snd_soc_register_dai(&wm8731_dai); ret = snd_soc_register_dai(&wm8731_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); snd_soc_unregister_codec(codec);
return ret; goto err_codec;
} }
return 0; return 0;
err_codec:
snd_soc_unregister_codec(codec);
err:
kfree(wm8731);
return ret;
} }
static void wm8731_unregister(struct wm8731_priv *wm8731) static void wm8731_unregister(struct wm8731_priv *wm8731)