From 73db6c90ef9f1cd09638133b2feb6d8213fc3115 Mon Sep 17 00:00:00 2001 From: Axel Lin Date: Tue, 20 Dec 2011 14:38:09 +0800 Subject: [PATCH] --- yaml --- r: 283988 b: refs/heads/master c: 7246492dcf0e56d23f71194f8cd8722a681dfa47 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/sound/soc/codecs/ak4535.c | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index a26db0f41346..d6f2535e8ffe 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3922d5180ffa605b08c50c13a7c9db68ab6bbc19 +refs/heads/master: 7246492dcf0e56d23f71194f8cd8722a681dfa47 diff --git a/trunk/sound/soc/codecs/ak4535.c b/trunk/sound/soc/codecs/ak4535.c index 96296fd172f9..9e809e05d066 100644 --- a/trunk/sound/soc/codecs/ak4535.c +++ b/trunk/sound/soc/codecs/ak4535.c @@ -416,7 +416,8 @@ static __devinit int ak4535_i2c_probe(struct i2c_client *i2c, struct ak4535_priv *ak4535; int ret; - ak4535 = kzalloc(sizeof(struct ak4535_priv), GFP_KERNEL); + ak4535 = devm_kzalloc(&i2c->dev, sizeof(struct ak4535_priv), + GFP_KERNEL); if (ak4535 == NULL) return -ENOMEM; @@ -425,15 +426,12 @@ static __devinit int ak4535_i2c_probe(struct i2c_client *i2c, ret = snd_soc_register_codec(&i2c->dev, &soc_codec_dev_ak4535, &ak4535_dai, 1); - if (ret < 0) - kfree(ak4535); return ret; } static __devexit int ak4535_i2c_remove(struct i2c_client *client) { snd_soc_unregister_codec(&client->dev); - kfree(i2c_get_clientdata(client)); return 0; }