diff options
| author | Axel Lin <axel.lin@gmail.com> | 2010-07-23 05:53:51 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-08-03 07:45:52 +0100 |
| commit | 6b5d071e8ba7d802f3123e7b7a37ea13650a98bf (patch) | |
| tree | 2b0465ecb42757f5d2dee265b47bb3917451103a /sound | |
| parent | 8089a49d99bb25bc63237ae8e90a84c72897b66d (diff) | |
| download | linux-3.10-6b5d071e8ba7d802f3123e7b7a37ea13650a98bf.tar.gz linux-3.10-6b5d071e8ba7d802f3123e7b7a37ea13650a98bf.tar.bz2 linux-3.10-6b5d071e8ba7d802f3123e7b7a37ea13650a98bf.zip | |
ASoC: wm8961: fix resource reclaim in wm8961_register error path
This patch fixes the error path in wm8961_register 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>
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/soc/codecs/wm8961.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/sound/soc/codecs/wm8961.c b/sound/soc/codecs/wm8961.c index 5b9a756242f..2549d3a297a 100644 --- a/sound/soc/codecs/wm8961.c +++ b/sound/soc/codecs/wm8961.c @@ -1102,7 +1102,7 @@ static int wm8961_register(struct wm8961_priv *wm8961) ret = wm8961_reset(codec); if (ret < 0) { dev_err(codec->dev, "Failed to issue reset\n"); - return ret; + goto err; } /* Enable class W */ @@ -1147,18 +1147,19 @@ static int wm8961_register(struct wm8961_priv *wm8961) ret = snd_soc_register_codec(codec); if (ret != 0) { dev_err(codec->dev, "Failed to register codec: %d\n", ret); - return ret; + goto err; } ret = snd_soc_register_dai(&wm8961_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: kfree(wm8961); return ret; |