]> bbs.cooldavid.org Git - net-next-2.6.git/commitdiff
ASoC: ad1836: fix a memory leak if another ad1836 is registered
authorAxel Lin <axel.lin@gmail.com>
Fri, 23 Jul 2010 05:53:43 +0000 (05:53 +0000)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Tue, 3 Aug 2010 06:40:26 +0000 (07:40 +0100)
ad1836 is allocated in ad1836_spi_probe() but is not freed if ad1836_register()
return -EINVAL (if another ad1836 is registered).

Signed-off-by: Axel Lin <axel.lin@gmail.com>
Acked-by: Barry Song <21cnbao@gmail.com>
Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
sound/soc/codecs/ad1836.c

index 217538423225950be0c338a57e3decf0919bb6b1..a01006c8c606ffd613b250bf7f95fbc95ebaa05c 100644 (file)
@@ -272,6 +272,7 @@ static int ad1836_register(struct ad1836_priv *ad1836)
 
        if (ad1836_codec) {
                dev_err(codec->dev, "Another ad1836 is registered\n");
+               kfree(ad1836);
                return -EINVAL;
        }