summaryrefslogtreecommitdiff
path: root/sound/soc/codecs/rt5631.c
diff options
context:
space:
mode:
authorAxel Lin <axel.lin@gmail.com>2011-12-29 12:04:15 +0800
committerMark Brown <broonie@opensource.wolfsonmicro.com>2012-01-02 12:28:12 +0000
commita92b0a0803a40f91689fa479b7a169d0467ba33f (patch)
tree9b67c3343dfa2d2370167be6610b2a84d06a7e21 /sound/soc/codecs/rt5631.c
parentbf791bdb383fdf159c2282d958682b92a2601170 (diff)
ASoC: Convert rt5631 to devm_kzalloc()
Signed-off-by: Axel Lin <axel.lin@gmail.com> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'sound/soc/codecs/rt5631.c')
-rw-r--r--sound/soc/codecs/rt5631.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/sound/soc/codecs/rt5631.c b/sound/soc/codecs/rt5631.c
index f6e4f5ed9286..20c324c7c349 100644
--- a/sound/soc/codecs/rt5631.c
+++ b/sound/soc/codecs/rt5631.c
@@ -1724,7 +1724,8 @@ static int rt5631_i2c_probe(struct i2c_client *i2c,
struct rt5631_priv *rt5631;
int ret;
- rt5631 = kzalloc(sizeof(struct rt5631_priv), GFP_KERNEL);
+ rt5631 = devm_kzalloc(&i2c->dev, sizeof(struct rt5631_priv),
+ GFP_KERNEL);
if (NULL == rt5631)
return -ENOMEM;
@@ -1732,16 +1733,12 @@ static int rt5631_i2c_probe(struct i2c_client *i2c,
ret = snd_soc_register_codec(&i2c->dev, &soc_codec_dev_rt5631,
rt5631_dai, ARRAY_SIZE(rt5631_dai));
- if (ret < 0)
- kfree(rt5631);
-
return ret;
}
static __devexit int rt5631_i2c_remove(struct i2c_client *client)
{
snd_soc_unregister_codec(&client->dev);
- kfree(i2c_get_clientdata(client));
return 0;
}