From: Axel Lin Date: Mon, 26 Dec 2011 12:57:24 +0000 (+0800) Subject: ASoC: Convert tlv320aic32x4 to devm_kzalloc() X-Git-Tag: accepted/tizen/common/20141203.182822~4454^2~166 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=658ecf7784e9bd081ed49a17274ff36bc15ff4d3;p=platform%2Fkernel%2Flinux-arm64.git ASoC: Convert tlv320aic32x4 to devm_kzalloc() Signed-off-by: Axel Lin Signed-off-by: Mark Brown --- diff --git a/sound/soc/codecs/tlv320aic32x4.c b/sound/soc/codecs/tlv320aic32x4.c index 81a26e1..eb401ef 100644 --- a/sound/soc/codecs/tlv320aic32x4.c +++ b/sound/soc/codecs/tlv320aic32x4.c @@ -709,7 +709,8 @@ static __devinit int aic32x4_i2c_probe(struct i2c_client *i2c, struct aic32x4_priv *aic32x4; int ret; - aic32x4 = kzalloc(sizeof(struct aic32x4_priv), GFP_KERNEL); + aic32x4 = devm_kzalloc(&i2c->dev, sizeof(struct aic32x4_priv), + GFP_KERNEL); if (aic32x4 == NULL) return -ENOMEM; @@ -728,15 +729,12 @@ static __devinit int aic32x4_i2c_probe(struct i2c_client *i2c, ret = snd_soc_register_codec(&i2c->dev, &soc_codec_dev_aic32x4, &aic32x4_dai, 1); - if (ret < 0) - kfree(aic32x4); return ret; } static __devexit int aic32x4_i2c_remove(struct i2c_client *client) { snd_soc_unregister_codec(&client->dev); - kfree(i2c_get_clientdata(client)); return 0; }