From 74528928acc43866b2b56504836aa941748b49bb Mon Sep 17 00:00:00 2001 From: Axel Lin Date: Thu, 29 Dec 2011 11:56:23 +0800 Subject: [PATCH] --- yaml --- r: 284055 b: refs/heads/master c: 360b70ca5e4668c9b9e24d8b200e7069bec83b4e h: refs/heads/master i: 284053: 2144b7da3ff300856b026167ac2e7fff0068c984 284051: d2256d2595248d1f8cb33b8d265d63eb6afff65a 284047: 497a2e3111f993f7a8995c04024f039006fa39f6 v: v3 --- [refs] | 2 +- trunk/sound/soc/codecs/alc5623.c | 11 +++-------- 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/[refs] b/[refs] index df70325dac69..ae1d1d5ea5bf 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e2257db325e8031a149c0f8e3f228d02d08ae578 +refs/heads/master: 360b70ca5e4668c9b9e24d8b200e7069bec83b4e diff --git a/trunk/sound/soc/codecs/alc5623.c b/trunk/sound/soc/codecs/alc5623.c index 6a9b621ef32d..3feee569ceea 100644 --- a/trunk/sound/soc/codecs/alc5623.c +++ b/trunk/sound/soc/codecs/alc5623.c @@ -1022,7 +1022,8 @@ static int alc5623_i2c_probe(struct i2c_client *client, dev_dbg(&client->dev, "Found codec id : alc56%02x\n", vid2); - alc5623 = kzalloc(sizeof(struct alc5623_priv), GFP_KERNEL); + alc5623 = devm_kzalloc(&client->dev, sizeof(struct alc5623_priv), + GFP_KERNEL); if (alc5623 == NULL) return -ENOMEM; @@ -1044,7 +1045,6 @@ static int alc5623_i2c_probe(struct i2c_client *client, alc5623_dai.name = "alc5623-hifi"; break; default: - kfree(alc5623); return -EINVAL; } @@ -1053,20 +1053,15 @@ static int alc5623_i2c_probe(struct i2c_client *client, ret = snd_soc_register_codec(&client->dev, &soc_codec_device_alc5623, &alc5623_dai, 1); - if (ret != 0) { + if (ret != 0) dev_err(&client->dev, "Failed to register codec: %d\n", ret); - kfree(alc5623); - } return ret; } static int alc5623_i2c_remove(struct i2c_client *client) { - struct alc5623_priv *alc5623 = i2c_get_clientdata(client); - snd_soc_unregister_codec(&client->dev); - kfree(alc5623); return 0; }