ASoC: Fix incorrect kfree in wm8731_probe error path
authorAxel Lin <axel.lin@gmail.com>
Tue, 16 Nov 2010 08:10:41 +0000 (16:10 +0800)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Tue, 16 Nov 2010 11:24:04 +0000 (11:24 +0000)
We allocated memory for wm8731 in wm8731_spi_probe / wm8731_i2c_probe,
and will free the memory in either wm8731_spi_probe / wm8731_i2c_probe
error path or wm8731_spi_remove / wm8731_i2c_remove.

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

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

index 95ade3245056ce14cfe1e6e6a89442e71d21f482..4b709589e26c96e23ca69dae035ed5db3f38c125 100644 (file)
@@ -543,7 +543,6 @@ err_regulator_enable:
 err_regulator_get:
        regulator_bulk_free(ARRAY_SIZE(wm8731->supplies), wm8731->supplies);
 
-       kfree(wm8731);
        return ret;
 }