diff options
author | Axel Lin <axel.lin@gmail.com> | 2011-12-20 01:40:12 -0500 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-12-20 05:13:58 -0500 |
commit | 2ff49eea9b8a1d92c2ab09d803dfdc06f4f8e74b (patch) | |
tree | 5dbcecfe035b0865d975df9da612ce0b395280e7 | |
parent | 4273fcfd71285b4ab6a5d3ce3943e30c2975b797 (diff) |
ASoC: Convert ak4642 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/ak4642.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/sound/soc/codecs/ak4642.c b/sound/soc/codecs/ak4642.c index 9b4ee6c63d28..5ef70b5d27e4 100644 --- a/sound/soc/codecs/ak4642.c +++ b/sound/soc/codecs/ak4642.c | |||
@@ -525,7 +525,8 @@ static __devinit int ak4642_i2c_probe(struct i2c_client *i2c, | |||
525 | struct ak4642_priv *ak4642; | 525 | struct ak4642_priv *ak4642; |
526 | int ret; | 526 | int ret; |
527 | 527 | ||
528 | ak4642 = kzalloc(sizeof(struct ak4642_priv), GFP_KERNEL); | 528 | ak4642 = devm_kzalloc(&i2c->dev, sizeof(struct ak4642_priv), |
529 | GFP_KERNEL); | ||
529 | if (!ak4642) | 530 | if (!ak4642) |
530 | return -ENOMEM; | 531 | return -ENOMEM; |
531 | 532 | ||
@@ -535,15 +536,12 @@ static __devinit int ak4642_i2c_probe(struct i2c_client *i2c, | |||
535 | ret = snd_soc_register_codec(&i2c->dev, | 536 | ret = snd_soc_register_codec(&i2c->dev, |
536 | (struct snd_soc_codec_driver *)id->driver_data, | 537 | (struct snd_soc_codec_driver *)id->driver_data, |
537 | &ak4642_dai, 1); | 538 | &ak4642_dai, 1); |
538 | if (ret < 0) | ||
539 | kfree(ak4642); | ||
540 | return ret; | 539 | return ret; |
541 | } | 540 | } |
542 | 541 | ||
543 | static __devexit int ak4642_i2c_remove(struct i2c_client *client) | 542 | static __devexit int ak4642_i2c_remove(struct i2c_client *client) |
544 | { | 543 | { |
545 | snd_soc_unregister_codec(&client->dev); | 544 | snd_soc_unregister_codec(&client->dev); |
546 | kfree(i2c_get_clientdata(client)); | ||
547 | return 0; | 545 | return 0; |
548 | } | 546 | } |
549 | 547 | ||