From faae472281547cf9148b76dd47860ce773a9756e Mon Sep 17 00:00:00 2001 From: Fabio Estevam Date: Wed, 28 Dec 2011 11:30:11 -0200 Subject: [PATCH] --- yaml --- r: 284029 b: refs/heads/master c: 512fa7c40b9e808000eac31458668369e131a243 h: refs/heads/master i: 284027: c3c3c5c90b49c5ecb83e9efb5d3066df30f3ffe3 v: v3 --- [refs] | 2 +- trunk/sound/soc/codecs/sgtl5000.c | 14 +++----------- 2 files changed, 4 insertions(+), 12 deletions(-) diff --git a/[refs] b/[refs] index 2a42ff1e06cf..4ad63b49cf83 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: cf1ee98d800459e6f055742f84355b1aa9e937ae +refs/heads/master: 512fa7c40b9e808000eac31458668369e131a243 diff --git a/trunk/sound/soc/codecs/sgtl5000.c b/trunk/sound/soc/codecs/sgtl5000.c index 827a43bec531..fc9b127206e2 100644 --- a/trunk/sound/soc/codecs/sgtl5000.c +++ b/trunk/sound/soc/codecs/sgtl5000.c @@ -1401,7 +1401,8 @@ static __devinit int sgtl5000_i2c_probe(struct i2c_client *client, struct sgtl5000_priv *sgtl5000; int ret; - sgtl5000 = kzalloc(sizeof(struct sgtl5000_priv), GFP_KERNEL); + sgtl5000 = devm_kzalloc(&client->dev, sizeof(struct sgtl5000_priv), + GFP_KERNEL); if (!sgtl5000) return -ENOMEM; @@ -1409,22 +1410,13 @@ static __devinit int sgtl5000_i2c_probe(struct i2c_client *client, ret = snd_soc_register_codec(&client->dev, &sgtl5000_driver, &sgtl5000_dai, 1); - if (ret) { - dev_err(&client->dev, "Failed to register codec: %d\n", ret); - kfree(sgtl5000); - return ret; - } - - return 0; + return ret; } static __devexit int sgtl5000_i2c_remove(struct i2c_client *client) { - struct sgtl5000_priv *sgtl5000 = i2c_get_clientdata(client); - snd_soc_unregister_codec(&client->dev); - kfree(sgtl5000); return 0; }