diff options
author | Axel Lin <axel.lin@gmail.com> | 2011-12-28 23:03:16 -0500 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-01-02 07:28:11 -0500 |
commit | bf791bdb383fdf159c2282d958682b92a2601170 (patch) | |
tree | 803cf93b75fc1d4f86f0c8b20e71783fba8ca995 /sound/soc/codecs | |
parent | b1b548824ba7e182424da6e4655c1904be7dc6fa (diff) |
ASoC: Convert max9850 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/max9850.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/sound/soc/codecs/max9850.c b/sound/soc/codecs/max9850.c index 47060d2afe90..a1913091f56c 100644 --- a/sound/soc/codecs/max9850.c +++ b/sound/soc/codecs/max9850.c | |||
@@ -335,7 +335,8 @@ static int __devinit max9850_i2c_probe(struct i2c_client *i2c, | |||
335 | struct max9850_priv *max9850; | 335 | struct max9850_priv *max9850; |
336 | int ret; | 336 | int ret; |
337 | 337 | ||
338 | max9850 = kzalloc(sizeof(struct max9850_priv), GFP_KERNEL); | 338 | max9850 = devm_kzalloc(&i2c->dev, sizeof(struct max9850_priv), |
339 | GFP_KERNEL); | ||
339 | if (max9850 == NULL) | 340 | if (max9850 == NULL) |
340 | return -ENOMEM; | 341 | return -ENOMEM; |
341 | 342 | ||
@@ -343,15 +344,12 @@ static int __devinit max9850_i2c_probe(struct i2c_client *i2c, | |||
343 | 344 | ||
344 | ret = snd_soc_register_codec(&i2c->dev, | 345 | ret = snd_soc_register_codec(&i2c->dev, |
345 | &soc_codec_dev_max9850, &max9850_dai, 1); | 346 | &soc_codec_dev_max9850, &max9850_dai, 1); |
346 | if (ret < 0) | ||
347 | kfree(max9850); | ||
348 | return ret; | 347 | return ret; |
349 | } | 348 | } |
350 | 349 | ||
351 | static __devexit int max9850_i2c_remove(struct i2c_client *client) | 350 | static __devexit int max9850_i2c_remove(struct i2c_client *client) |
352 | { | 351 | { |
353 | snd_soc_unregister_codec(&client->dev); | 352 | snd_soc_unregister_codec(&client->dev); |
354 | kfree(i2c_get_clientdata(client)); | ||
355 | return 0; | 353 | return 0; |
356 | } | 354 | } |
357 | 355 | ||