summaryrefslogtreecommitdiffstats
path: root/sound/soc/codecs/ak4642.c
diff options
context:
space:
mode:
authorAxel Lin <axel.lin@gmail.com>2011-12-20 14:40:12 +0800
committerMark Brown <broonie@opensource.wolfsonmicro.com>2011-12-20 10:13:58 +0000
commit2ff49eea9b8a1d92c2ab09d803dfdc06f4f8e74b (patch)
tree5dbcecfe035b0865d975df9da612ce0b395280e7 /sound/soc/codecs/ak4642.c
parent4273fcfd71285b4ab6a5d3ce3943e30c2975b797 (diff)
downloadlinux-stable-2ff49eea9b8a1d92c2ab09d803dfdc06f4f8e74b.tar.gz
linux-stable-2ff49eea9b8a1d92c2ab09d803dfdc06f4f8e74b.tar.bz2
linux-stable-2ff49eea9b8a1d92c2ab09d803dfdc06f4f8e74b.zip
ASoC: Convert ak4642 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/ak4642.c')
-rw-r--r--sound/soc/codecs/ak4642.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/sound/soc/codecs/ak4642.c b/sound/soc/codecs/ak4642.c
index 9b4ee6c63d28..5ef70b5d27e4 100644
--- a/sound/soc/codecs/ak4642.c
+++ b/sound/soc/codecs/ak4642.c
@@ -525,7 +525,8 @@ static __devinit int ak4642_i2c_probe(struct i2c_client *i2c,
struct ak4642_priv *ak4642;
int ret;
- ak4642 = kzalloc(sizeof(struct ak4642_priv), GFP_KERNEL);
+ ak4642 = devm_kzalloc(&i2c->dev, sizeof(struct ak4642_priv),
+ GFP_KERNEL);
if (!ak4642)
return -ENOMEM;
@@ -535,15 +536,12 @@ static __devinit int ak4642_i2c_probe(struct i2c_client *i2c,
ret = snd_soc_register_codec(&i2c->dev,
(struct snd_soc_codec_driver *)id->driver_data,
&ak4642_dai, 1);
- if (ret < 0)
- kfree(ak4642);
return ret;
}
static __devexit int ak4642_i2c_remove(struct i2c_client *client)
{
snd_soc_unregister_codec(&client->dev);
- kfree(i2c_get_clientdata(client));
return 0;
}