summaryrefslogtreecommitdiffstats
path: root/sound/soc
diff options
context:
space:
mode:
authorAxel Lin <axel.lin@gmail.com>2010-11-16 16:08:51 +0800
committerMark Brown <broonie@opensource.wolfsonmicro.com>2010-11-16 11:23:39 +0000
commit50d0ac2e1e98efa89f6dc167977b1a0d46d5e48e (patch)
tree2102610a081079b34d5d00c8af075214c231be79 /sound/soc
parentaf353d8a134d6147e29a3371015d2eef8d7f0657 (diff)
downloadtalos-op-linux-50d0ac2e1e98efa89f6dc167977b1a0d46d5e48e.tar.gz
talos-op-linux-50d0ac2e1e98efa89f6dc167977b1a0d46d5e48e.zip
ASoC: Fix incorrect kfree in ad193x_probe error path
We allocated memory for ad193x in ad193x_spi_probe, and will free the memory in either ad193x_spi_probe error path or ad193x_spi_remove. Thus we should not call kfree(ad193x) in ad193x_probe, otherwise we have double free of ad193x. 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>
Diffstat (limited to 'sound/soc')
-rw-r--r--sound/soc/codecs/ad193x.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/sound/soc/codecs/ad193x.c b/sound/soc/codecs/ad193x.c
index dc105d8aaa0f..fd3e659f90b1 100644
--- a/sound/soc/codecs/ad193x.c
+++ b/sound/soc/codecs/ad193x.c
@@ -364,7 +364,6 @@ static int ad193x_probe(struct snd_soc_codec *codec)
if (ret < 0) {
dev_err(codec->dev, "failed to set cache I/O: %d\n",
ret);
- kfree(ad193x);
return ret;
}
OpenPOWER on IntegriCloud