From 9804170fd15ccb9504c3a232383426c0d456619a Mon Sep 17 00:00:00 2001 From: Axel Lin Date: Mon, 26 Dec 2011 20:53:09 +0800 Subject: [PATCH] --- yaml --- r: 284034 b: refs/heads/master c: 38b81c1d2517d7c4a6685d49136474bcd0105ab9 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/sound/soc/codecs/adau1701.c | 6 +----- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 76c81fdd6a4c..bcb5677ec8e4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6e4f17cb2b7e8a5327ccc5a6a32442acd408c190 +refs/heads/master: 38b81c1d2517d7c4a6685d49136474bcd0105ab9 diff --git a/trunk/sound/soc/codecs/adau1701.c b/trunk/sound/soc/codecs/adau1701.c index 6a6af567f02a..6b325ea03869 100644 --- a/trunk/sound/soc/codecs/adau1701.c +++ b/trunk/sound/soc/codecs/adau1701.c @@ -496,23 +496,19 @@ static __devinit int adau1701_i2c_probe(struct i2c_client *client, struct adau1701 *adau1701; int ret; - adau1701 = kzalloc(sizeof(*adau1701), GFP_KERNEL); + adau1701 = devm_kzalloc(&client->dev, sizeof(*adau1701), GFP_KERNEL); if (!adau1701) return -ENOMEM; i2c_set_clientdata(client, adau1701); ret = snd_soc_register_codec(&client->dev, &adau1701_codec_drv, &adau1701_dai, 1); - if (ret < 0) - kfree(adau1701); - return ret; } static __devexit int adau1701_i2c_remove(struct i2c_client *client) { snd_soc_unregister_codec(&client->dev); - kfree(i2c_get_clientdata(client)); return 0; }