Skip to content

Commit

Permalink
ASoC: wm8904: fix resource reclaim in wm8904_register error path
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Axel Lin authored and Mark Brown committed Aug 3, 2010
1 parent 2c2749d commit 62f5ad6
Showing 1 changed file with 8 additions and 5 deletions.
13 changes: 8 additions & 5 deletions sound/soc/codecs/wm8904.c
Original file line number Diff line number Diff line change
Expand Up @@ -2433,7 +2433,8 @@ static int wm8904_register(struct wm8904_priv *wm8904,

if (wm8904_codec) {
dev_err(codec->dev, "Another WM8904 is registered\n");
return -EINVAL;
ret = -EINVAL;
goto err;
}

mutex_init(&codec->mutex);
Expand Down Expand Up @@ -2462,7 +2463,8 @@ static int wm8904_register(struct wm8904_priv *wm8904,
default:
dev_err(codec->dev, "Unknown device type %d\n",
wm8904->devtype);
return -EINVAL;
ret = -EINVAL;
goto err;
}

memcpy(codec->reg_cache, wm8904_reg, sizeof(wm8904_reg));
Expand Down Expand Up @@ -2566,18 +2568,19 @@ static int wm8904_register(struct wm8904_priv *wm8904,
ret = snd_soc_register_codec(codec);
if (ret != 0) {
dev_err(codec->dev, "Failed to register codec: %d\n", ret);
return ret;
goto err_enable;
}

ret = snd_soc_register_dai(&wm8904_dai);
if (ret != 0) {
dev_err(codec->dev, "Failed to register DAI: %d\n", ret);
snd_soc_unregister_codec(codec);
return ret;
goto err_codec;
}

return 0;

err_codec:
snd_soc_unregister_codec(codec);
err_enable:
regulator_bulk_disable(ARRAY_SIZE(wm8904->supplies), wm8904->supplies);
err_get:
Expand Down

0 comments on commit 62f5ad6

Please sign in to comment.