From 4b58d830e7c351e57b7177f6f01191235c152b6a Mon Sep 17 00:00:00 2001 From: Axel Lin Date: Thu, 29 Dec 2011 12:11:00 +0800 Subject: [PATCH] --- yaml --- r: 284057 b: refs/heads/master c: a54877d7456ffa88c95d7eb587971792cb1892d6 h: refs/heads/master i: 284055: 74528928acc43866b2b56504836aa941748b49bb v: v3 --- [refs] | 2 +- trunk/sound/soc/codecs/tlv320dac33.c | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index c32a897368db..3cf8abd5c6a7 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7fd8a67446aded9d25e0ae1d94d19105f1620af5 +refs/heads/master: a54877d7456ffa88c95d7eb587971792cb1892d6 diff --git a/trunk/sound/soc/codecs/tlv320dac33.c b/trunk/sound/soc/codecs/tlv320dac33.c index c7a61fbdae4b..f0aad26cdb31 100644 --- a/trunk/sound/soc/codecs/tlv320dac33.c +++ b/trunk/sound/soc/codecs/tlv320dac33.c @@ -1532,7 +1532,8 @@ static int __devinit dac33_i2c_probe(struct i2c_client *client, } pdata = client->dev.platform_data; - dac33 = kzalloc(sizeof(struct tlv320dac33_priv), GFP_KERNEL); + dac33 = devm_kzalloc(&client->dev, sizeof(struct tlv320dac33_priv), + GFP_KERNEL); if (dac33 == NULL) return -ENOMEM; @@ -1587,7 +1588,6 @@ static int __devinit dac33_i2c_probe(struct i2c_client *client, if (dac33->power_gpio >= 0) gpio_free(dac33->power_gpio); err_gpio: - kfree(dac33); return ret; } @@ -1604,8 +1604,6 @@ static int __devexit dac33_i2c_remove(struct i2c_client *client) regulator_bulk_free(ARRAY_SIZE(dac33->supplies), dac33->supplies); snd_soc_unregister_codec(&client->dev); - kfree(dac33); - return 0; }