diff options
| author |   Axel Lin <axel.lin@gmail.com> | 2011-12-20 14:37:12 +0800 |
|---|---|---|
| committer |   Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-12-20 10:13:57 +0000 |
| commit | 3922d5180ffa605b08c50c13a7c9db68ab6bbc19 (patch) | |
| tree | fe7920e1656423aef2bdc583eb77a96a28b29819 /sound/soc/codecs/ak4104.c | |
| parent | ASoC: Tegra+WM8903 machine: Add device tree binding (diff) | |
| download | linux-dev-3922d5180ffa605b08c50c13a7c9db68ab6bbc19.tar.xz linux-dev-3922d5180ffa605b08c50c13a7c9db68ab6bbc19.zip | |
ASoC: Convert ak4104 to devm_kzalloc()
Signed-off-by: Axel Lin <axel.lin@gmail.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'sound/soc/codecs/ak4104.c')
| -rw-r--r-- | sound/soc/codecs/ak4104.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/sound/soc/codecs/ak4104.c b/sound/soc/codecs/ak4104.c index 152420ca78b8..d27b5e4cce99 100644 --- a/sound/soc/codecs/ak4104.c +++ b/sound/soc/codecs/ak4104.c @@ -261,7 +261,8 @@ static int ak4104_spi_probe(struct spi_device *spi) if (ret < 0) return ret; - ak4104 = kzalloc(sizeof(struct ak4104_private), GFP_KERNEL); + ak4104 = devm_kzalloc(&spi->dev, sizeof(struct ak4104_private), + GFP_KERNEL); if (ak4104 == NULL) return -ENOMEM; @@ -271,15 +272,12 @@ static int ak4104_spi_probe(struct spi_device *spi) ret = snd_soc_register_codec(&spi->dev, &soc_codec_device_ak4104, &ak4104_dai, 1); - if (ret < 0) - kfree(ak4104); return ret; } static int __devexit ak4104_spi_remove(struct spi_device *spi) { snd_soc_unregister_codec(&spi->dev); - kfree(spi_get_drvdata(spi)); return 0; } |