diff options
| author | Axel Lin <axel.lin@gmail.com> | 2011-12-20 10:39:20 +0400 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-12-20 14:13:58 +0400 |
| commit | 4273fcfd71285b4ab6a5d3ce3943e30c2975b797 (patch) | |
| tree | 37380f1d9a977c516ba47021da58610d818f1b35 /sound/soc/codecs/ak4641.c | |
| parent | 7246492dcf0e56d23f71194f8cd8722a681dfa47 (diff) | |
| download | linux-4273fcfd71285b4ab6a5d3ce3943e30c2975b797.tar.xz | |
ASoC: Convert ak4641 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/ak4641.c')
| -rw-r--r-- | sound/soc/codecs/ak4641.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/sound/soc/codecs/ak4641.c b/sound/soc/codecs/ak4641.c index 90184701480d..266ebea2b65a 100644 --- a/sound/soc/codecs/ak4641.c +++ b/sound/soc/codecs/ak4641.c @@ -602,7 +602,8 @@ static int __devinit ak4641_i2c_probe(struct i2c_client *i2c, struct ak4641_priv *ak4641; int ret; - ak4641 = kzalloc(sizeof(struct ak4641_priv), GFP_KERNEL); + ak4641 = devm_kzalloc(&i2c->dev, sizeof(struct ak4641_priv), + GFP_KERNEL); if (!ak4641) return -ENOMEM; @@ -610,16 +611,12 @@ static int __devinit ak4641_i2c_probe(struct i2c_client *i2c, ret = snd_soc_register_codec(&i2c->dev, &soc_codec_dev_ak4641, ak4641_dai, ARRAY_SIZE(ak4641_dai)); - if (ret < 0) - kfree(ak4641); - return ret; } static int __devexit ak4641_i2c_remove(struct i2c_client *i2c) { snd_soc_unregister_codec(&i2c->dev); - kfree(i2c_get_clientdata(i2c)); return 0; } |