ASoC: Fix leaks in WM8988 registration error handling
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Sun, 5 Jul 2009 15:29:39 +0000 (16:29 +0100)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Sun, 5 Jul 2009 15:29:39 +0000 (16:29 +0100)
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
sound/soc/codecs/wm8988.c

index 03fac6a..6f15acd 100644 (file)
@@ -902,7 +902,7 @@ static int wm8988_register(struct wm8988_priv *wm8988)
        ret = wm8988_reset(codec);
        if (ret < 0) {
                dev_err(codec->dev, "Failed to issue reset\n");
-               return ret;
+               goto err;
        }
 
        /* set the update bits (we always update left then right) */
@@ -926,18 +926,20 @@ static int wm8988_register(struct wm8988_priv *wm8988)
        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(&wm8988_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(wm8988);
        return ret;