]> git.karo-electronics.de Git - mv-sheeva.git/commitdiff
ASoC: Fix incorrect kfree in aic3x_probe error path
authorAxel Lin <axel.lin@gmail.com>
Tue, 16 Nov 2010 08:09:41 +0000 (16:09 +0800)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Tue, 16 Nov 2010 11:23:50 +0000 (11:23 +0000)
We allocated memory for aic3x in aic3x_i2c_probe,
and will free the memory in either aic3x_i2c_probe error path or
aic3x_i2c_remove.

Thus we should not call kfree(aic3x) in aic3x_probe, otherwise
we have double free of aic3x.

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>
sound/soc/codecs/tlv320aic3x.c

index 6173c2b4c3645efc66b1dc52f02f53b1b3ec66c3..df726a5066e828eabfacafa225f232b4725ffc60 100644 (file)
@@ -1419,7 +1419,6 @@ err_get:
        if (aic3x->gpio_reset >= 0)
                gpio_free(aic3x->gpio_reset);
 err_gpio:
-       kfree(aic3x);
        return ret;
 }