diff options
| author | Axel Lin <axel.lin@gmail.com> | 2011-12-29 12:01:07 +0800 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-01-02 12:28:11 +0000 |
| commit | 49ba7673243013103bde4706c506bda2c631a39b (patch) | |
| tree | 39e302e10db4f67548c4ff327a6e38d736701ab4 | |
| parent | 021b918efb204b1deda7cfc7edef2972d98ffc46 (diff) | |
| download | linux-3.10-49ba7673243013103bde4706c506bda2c631a39b.tar.gz linux-3.10-49ba7673243013103bde4706c506bda2c631a39b.tar.bz2 linux-3.10-49ba7673243013103bde4706c506bda2c631a39b.zip | |
ASoC: Convert max98088 to devm_kzalloc()
Signed-off-by: Axel Lin <axel.lin@gmail.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
| -rw-r--r-- | sound/soc/codecs/max98088.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/sound/soc/codecs/max98088.c b/sound/soc/codecs/max98088.c index ba4f6f167a1..006efcfe6dd 100644 --- a/sound/soc/codecs/max98088.c +++ b/sound/soc/codecs/max98088.c @@ -2069,7 +2069,8 @@ static int max98088_i2c_probe(struct i2c_client *i2c, struct max98088_priv *max98088; int ret; - max98088 = kzalloc(sizeof(struct max98088_priv), GFP_KERNEL); + max98088 = devm_kzalloc(&i2c->dev, sizeof(struct max98088_priv), + GFP_KERNEL); if (max98088 == NULL) return -ENOMEM; @@ -2080,15 +2081,12 @@ static int max98088_i2c_probe(struct i2c_client *i2c, ret = snd_soc_register_codec(&i2c->dev, &soc_codec_dev_max98088, &max98088_dai[0], 2); - if (ret < 0) - kfree(max98088); return ret; } static int __devexit max98088_i2c_remove(struct i2c_client *client) { snd_soc_unregister_codec(&client->dev); - kfree(i2c_get_clientdata(client)); return 0; } |