diff options
author | Axel Lin <axel.lin@gmail.com> | 2011-12-28 23:02:21 -0500 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-01-02 07:28:11 -0500 |
commit | b1b548824ba7e182424da6e4655c1904be7dc6fa (patch) | |
tree | 2d756654ae235e0a55880e8a6ba9bb83cb2798a1 /sound/soc/codecs/max98095.c | |
parent | 49ba7673243013103bde4706c506bda2c631a39b (diff) |
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/codecs/max98095.c')
-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, | |||
2340 | struct max98095_priv *max98095; | 2340 | struct max98095_priv *max98095; |
2341 | int ret; | 2341 | int ret; |
2342 | 2342 | ||
2343 | max98095 = kzalloc(sizeof(struct max98095_priv), GFP_KERNEL); | 2343 | max98095 = devm_kzalloc(&i2c->dev, sizeof(struct max98095_priv), |
2344 | GFP_KERNEL); | ||
2344 | if (max98095 == NULL) | 2345 | if (max98095 == NULL) |
2345 | return -ENOMEM; | 2346 | return -ENOMEM; |
2346 | 2347 | ||
@@ -2350,16 +2351,12 @@ static int max98095_i2c_probe(struct i2c_client *i2c, | |||
2350 | 2351 | ||
2351 | ret = snd_soc_register_codec(&i2c->dev, &soc_codec_dev_max98095, | 2352 | ret = snd_soc_register_codec(&i2c->dev, &soc_codec_dev_max98095, |
2352 | max98095_dai, ARRAY_SIZE(max98095_dai)); | 2353 | max98095_dai, ARRAY_SIZE(max98095_dai)); |
2353 | if (ret < 0) | ||
2354 | kfree(max98095); | ||
2355 | return ret; | 2354 | return ret; |
2356 | } | 2355 | } |
2357 | 2356 | ||
2358 | static int __devexit max98095_i2c_remove(struct i2c_client *client) | 2357 | static int __devexit max98095_i2c_remove(struct i2c_client *client) |
2359 | { | 2358 | { |
2360 | snd_soc_unregister_codec(&client->dev); | 2359 | snd_soc_unregister_codec(&client->dev); |
2361 | kfree(i2c_get_clientdata(client)); | ||
2362 | |||
2363 | return 0; | 2360 | return 0; |
2364 | } | 2361 | } |
2365 | 2362 | ||