From f74d7643fead6026c968518b4e260a73f1680e68 Mon Sep 17 00:00:00 2001 From: Axel Lin Date: Tue, 20 Dec 2011 14:37:12 +0800 Subject: [PATCH] --- yaml --- r: 283987 b: refs/heads/master c: 3922d5180ffa605b08c50c13a7c9db68ab6bbc19 h: refs/heads/master i: 283985: 3a694eb63e0b4e33125d2007e8f3f090ac09d5f9 283983: de69244e1202977475eb412a6a054ca1a48558da v: v3 --- [refs] | 2 +- trunk/sound/soc/codecs/ak4104.c | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index b3a97fa6651a..a26db0f41346 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 07cdf36d8c4ba4ad0db13228eb25bcd3d5138b29 +refs/heads/master: 3922d5180ffa605b08c50c13a7c9db68ab6bbc19 diff --git a/trunk/sound/soc/codecs/ak4104.c b/trunk/sound/soc/codecs/ak4104.c index 152420ca78b8..d27b5e4cce99 100644 --- a/trunk/sound/soc/codecs/ak4104.c +++ b/trunk/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; }