diff options
author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-12-29 16:16:59 -0500 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-01-20 08:58:24 -0500 |
commit | 42dad0d84a318d5245b8b311644388dae5f521c0 (patch) | |
tree | 1f5232e7fd8f7630f6dcf67afcb9c15a576cdf59 | |
parent | b5531205f51c6f5f073fd0c63cfa9659fa4d912b (diff) |
ASoC: Convert WM8940 to devm_kzalloc()
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
-rw-r--r-- | sound/soc/codecs/wm8940.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sound/soc/codecs/wm8940.c b/sound/soc/codecs/wm8940.c index ffc123bc943b..ae1933ed3e07 100644 --- a/sound/soc/codecs/wm8940.c +++ b/sound/soc/codecs/wm8940.c | |||
@@ -749,7 +749,8 @@ static __devinit int wm8940_i2c_probe(struct i2c_client *i2c, | |||
749 | struct wm8940_priv *wm8940; | 749 | struct wm8940_priv *wm8940; |
750 | int ret; | 750 | int ret; |
751 | 751 | ||
752 | wm8940 = kzalloc(sizeof(struct wm8940_priv), GFP_KERNEL); | 752 | wm8940 = devm_kzalloc(&i2c->dev, sizeof(struct wm8940_priv), |
753 | GFP_KERNEL); | ||
753 | if (wm8940 == NULL) | 754 | if (wm8940 == NULL) |
754 | return -ENOMEM; | 755 | return -ENOMEM; |
755 | 756 | ||
@@ -758,15 +759,14 @@ static __devinit int wm8940_i2c_probe(struct i2c_client *i2c, | |||
758 | 759 | ||
759 | ret = snd_soc_register_codec(&i2c->dev, | 760 | ret = snd_soc_register_codec(&i2c->dev, |
760 | &soc_codec_dev_wm8940, &wm8940_dai, 1); | 761 | &soc_codec_dev_wm8940, &wm8940_dai, 1); |
761 | if (ret < 0) | 762 | |
762 | kfree(wm8940); | ||
763 | return ret; | 763 | return ret; |
764 | } | 764 | } |
765 | 765 | ||
766 | static __devexit int wm8940_i2c_remove(struct i2c_client *client) | 766 | static __devexit int wm8940_i2c_remove(struct i2c_client *client) |
767 | { | 767 | { |
768 | snd_soc_unregister_codec(&client->dev); | 768 | snd_soc_unregister_codec(&client->dev); |
769 | kfree(i2c_get_clientdata(client)); | 769 | |
770 | return 0; | 770 | return 0; |
771 | } | 771 | } |
772 | 772 | ||