diff options
| author | Axel Lin <axel.lin@gmail.com> | 2011-12-26 13:54:04 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-12-27 13:58:02 +0100 |
| commit | 306bf6b19ee3da824fbdbdb2dc4e5d62a8983a2c (patch) | |
| tree | 53cb058493781cf18fd530c15e42ae9641b13ad4 /sound/soc/codecs | |
| parent | Merge branch 'for-3.2' into for-3.3 (diff) | |
| download | linux-306bf6b19ee3da824fbdbdb2dc4e5d62a8983a2c.tar.xz linux-306bf6b19ee3da824fbdbdb2dc4e5d62a8983a2c.zip | |
ASoC: Convert da7210 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')
| -rw-r--r-- | sound/soc/codecs/da7210.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/sound/soc/codecs/da7210.c b/sound/soc/codecs/da7210.c index e4ca61c18605..62e6a9cc82bd 100644 --- a/sound/soc/codecs/da7210.c +++ b/sound/soc/codecs/da7210.c @@ -944,7 +944,8 @@ static int __devinit da7210_i2c_probe(struct i2c_client *i2c, struct da7210_priv *da7210; int ret; - da7210 = kzalloc(sizeof(struct da7210_priv), GFP_KERNEL); + da7210 = devm_kzalloc(&i2c->dev, sizeof(struct da7210_priv), + GFP_KERNEL); if (!da7210) return -ENOMEM; @@ -953,16 +954,12 @@ static int __devinit da7210_i2c_probe(struct i2c_client *i2c, ret = snd_soc_register_codec(&i2c->dev, &soc_codec_dev_da7210, &da7210_dai, 1); - if (ret < 0) - kfree(da7210); - return ret; } static int __devexit da7210_i2c_remove(struct i2c_client *client) { snd_soc_unregister_codec(&client->dev); - kfree(i2c_get_clientdata(client)); return 0; } |