diff options
| author |   Axel Lin <axel.lin@gmail.com> | 2011-12-29 12:10:04 +0800 |
|---|---|---|
| committer |   Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-01-02 12:28:12 +0000 |
| commit | e2257db325e8031a149c0f8e3f228d02d08ae578 (patch) | |
| tree | 18105500791077a2b256468c8f7510e8df5ba0c7 /sound/soc | |
| parent | ASoC: Convert tlv320aic26 to devm_kzalloc() (diff) | |
| download | linux-dev-e2257db325e8031a149c0f8e3f228d02d08ae578.tar.xz linux-dev-e2257db325e8031a149c0f8e3f228d02d08ae578.zip | |
ASoC: Convert tlv320aic3x 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')
| -rw-r--r-- | sound/soc/codecs/tlv320aic3x.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/sound/soc/codecs/tlv320aic3x.c b/sound/soc/codecs/tlv320aic3x.c index 6f963c50e76e..492f22f8a4d7 100644 --- a/sound/soc/codecs/tlv320aic3x.c +++ b/sound/soc/codecs/tlv320aic3x.c @@ -1504,7 +1504,7 @@ static int aic3x_i2c_probe(struct i2c_client *i2c, struct aic3x_priv *aic3x; int ret; - aic3x = kzalloc(sizeof(struct aic3x_priv), GFP_KERNEL); + aic3x = devm_kzalloc(&i2c->dev, sizeof(struct aic3x_priv), GFP_KERNEL); if (aic3x == NULL) { dev_err(&i2c->dev, "failed to create private data\n"); return -ENOMEM; @@ -1524,15 +1524,12 @@ static int aic3x_i2c_probe(struct i2c_client *i2c, ret = snd_soc_register_codec(&i2c->dev, &soc_codec_dev_aic3x, &aic3x_dai, 1); - if (ret < 0) - kfree(aic3x); return ret; } static int aic3x_i2c_remove(struct i2c_client *client) { snd_soc_unregister_codec(&client->dev); - kfree(i2c_get_clientdata(client)); return 0; } |