diff options
| author | Axel Lin <axel.lin@gmail.com> | 2011-12-29 12:02:21 +0800 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-01-02 12:28:11 +0000 |
| commit | b1b548824ba7e182424da6e4655c1904be7dc6fa (patch) | |
| tree | 2d756654ae235e0a55880e8a6ba9bb83cb2798a1 /sound/soc | |
| parent | 49ba7673243013103bde4706c506bda2c631a39b (diff) | |
| download | linux-3.10-b1b548824ba7e182424da6e4655c1904be7dc6fa.tar.gz linux-3.10-b1b548824ba7e182424da6e4655c1904be7dc6fa.tar.bz2 linux-3.10-b1b548824ba7e182424da6e4655c1904be7dc6fa.zip | |
ASoC: Convert max98095 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/max98095.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/sound/soc/codecs/max98095.c b/sound/soc/codecs/max98095.c index c69dd022bea..fcfa7497d7b 100644 --- a/sound/soc/codecs/max98095.c +++ b/sound/soc/codecs/max98095.c @@ -2340,7 +2340,8 @@ static int max98095_i2c_probe(struct i2c_client *i2c, struct max98095_priv *max98095; int ret; - max98095 = kzalloc(sizeof(struct max98095_priv), GFP_KERNEL); + max98095 = devm_kzalloc(&i2c->dev, sizeof(struct max98095_priv), + GFP_KERNEL); if (max98095 == NULL) return -ENOMEM; @@ -2350,16 +2351,12 @@ static int max98095_i2c_probe(struct i2c_client *i2c, ret = snd_soc_register_codec(&i2c->dev, &soc_codec_dev_max98095, max98095_dai, ARRAY_SIZE(max98095_dai)); - if (ret < 0) - kfree(max98095); return ret; } static int __devexit max98095_i2c_remove(struct i2c_client *client) { snd_soc_unregister_codec(&client->dev); - kfree(i2c_get_clientdata(client)); - return 0; } |