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

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

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/wm8962.c

index e021866f5a85cfa2d948f9b36ede66d86564fc01..9f6beca951c476872c266cd29b3961b332724eb0 100644 (file)
@@ -3874,7 +3874,6 @@ err_enable:
 err_get:
        regulator_bulk_free(ARRAY_SIZE(wm8962->supplies), wm8962->supplies);
 err:
-       kfree(wm8962);
        return ret;
 }